7d74b0af13
Conflicts: Gemfile Gemfile.lock app/models/group.rb app/views/layouts/application.html.haml db/schema.rb public/stylesheets/git/style.css |
||
---|---|---|
.. | ||
confirmations | ||
mailer | ||
passwords | ||
registrations | ||
sessions | ||
shared | ||
unlocks |