7d74b0af13
Conflicts: Gemfile Gemfile.lock app/models/group.rb app/views/layouts/application.html.haml db/schema.rb public/stylesheets/git/style.css |
||
---|---|---|
.. | ||
development.rb | ||
production.rb | ||
test.rb |
7d74b0af13
Conflicts: Gemfile Gemfile.lock app/models/group.rb app/views/layouts/application.html.haml db/schema.rb public/stylesheets/git/style.css |
||
---|---|---|
.. | ||
development.rb | ||
production.rb | ||
test.rb |