e9b22a2def
Conflicts: app/views/layouts/_head_panel.html.erb |
||
---|---|---|
.. | ||
_flash.html.haml | ||
_head_panel.html.erb | ||
_page_title.html.haml | ||
application.html.haml | ||
devise.html.haml | ||
notify.html.haml | ||
project.html.haml |
e9b22a2def
Conflicts: app/views/layouts/_head_panel.html.erb |
||
---|---|---|
.. | ||
_flash.html.haml | ||
_head_panel.html.erb | ||
_page_title.html.haml | ||
application.html.haml | ||
devise.html.haml | ||
notify.html.haml | ||
project.html.haml |