621affecb5
Conflicts: Gemfile.lock app/helpers/application_helper.rb app/views/devise/sessions/new.html.erb db/schema.rb |
||
---|---|---|
.. | ||
_app_menu.html.haml | ||
_flash.html.haml | ||
_head.html.haml | ||
_head_panel.html.haml | ||
_page_title.html.haml | ||
_project_menu.html.haml | ||
admin.html.haml | ||
application.html.haml | ||
devise_layout.html.haml | ||
error.html.haml | ||
notify.html.haml | ||
profile.html.haml | ||
project.html.haml |