621affecb5
Conflicts: Gemfile.lock app/helpers/application_helper.rb app/views/devise/sessions/new.html.erb db/schema.rb |
||
---|---|---|
.. | ||
assets | ||
contexts | ||
controllers | ||
decorators | ||
helpers | ||
mailers | ||
models | ||
observers | ||
roles | ||
uploaders | ||
views | ||
workers |