4165b188eb
Conflicts: app/models/project.rb config/locales/en.yml |
||
---|---|---|
.. | ||
_form.html.haml | ||
_list.html.haml | ||
_own_projects_sidebar.html.haml | ||
_project.html.haml | ||
_sidebar.html.haml | ||
edit.html.haml | ||
index.html.haml | ||
new.html.haml | ||
show.html.haml |