5a8d8b6f20
Conflicts: app/views/dashboard/projects.html.haml |
||
---|---|---|
.. | ||
show | ||
_discussion.html.haml | ||
_form.html.haml | ||
_head.html.haml | ||
_merge_request.html.haml | ||
_new_compare.html.haml | ||
_new_submit.html.haml | ||
_show.html.haml | ||
automerge.js.haml | ||
branch_from.js.haml | ||
branch_to.js.haml | ||
diffs.html.haml | ||
edit.html.haml | ||
index.html.haml | ||
invalid.html.haml | ||
new.html.haml | ||
show.html.haml | ||
update.js.haml | ||
update_branches.js.haml |