621affecb5
Conflicts: Gemfile.lock app/helpers/application_helper.rb app/views/devise/sessions/new.html.erb db/schema.rb |
||
---|---|---|
.. | ||
design.html.haml | ||
index.html.haml | ||
password.html.haml | ||
show.html.haml | ||
token.html.haml |
621affecb5
Conflicts: Gemfile.lock app/helpers/application_helper.rb app/views/devise/sessions/new.html.erb db/schema.rb |
||
---|---|---|
.. | ||
design.html.haml | ||
index.html.haml | ||
password.html.haml | ||
show.html.haml | ||
token.html.haml |