f8ad4d2b42
Conflicts: app/models/project.rb |
||
---|---|---|
.. | ||
_flash.html.haml | ||
_head_panel.html.erb | ||
_middle_panel.html.haml | ||
_page_title.html.haml | ||
admin.html.haml | ||
application.html.haml | ||
devise.html.haml | ||
notify.html.haml | ||
profile.html.haml | ||
project.html.haml |