Douwe Maan 0283fff591 Merge branch 'master' into extend_markdown_upload ... # Conflicts: # app/views/projects/issues/_form.html.haml # app/views/projects/merge_requests/_form.html.haml # app/views/projects/merge_requests/_new_submit.html.haml # app/views/projects/milestones/_form.html.haml # app/views/projects/notes/_form.html.haml # app/views/projects/wikis/_form.html.haml # config/routes.rb # spec/controllers/projects_controller_spec.rb		2015-02-24 14:54:39 +01:00
..
show	Merge branch 'master' into rails-4.1.9	2015-02-21 12:55:28 -07:00
_discussion.html.haml	Merge branch 'master' into rails-4.1.9	2015-02-22 07:55:30 -07:00
_form.html.haml	Merge branch 'master' into extend_markdown_upload	2015-02-24 14:54:39 +01:00
_head.html.haml	…
_merge_request.html.haml	Merge branch 'master' into rails-4.1.9	2015-02-21 12:55:28 -07:00
_new_compare.html.haml	…
_new_submit.html.haml	Merge branch 'master' into extend_markdown_upload	2015-02-24 14:54:39 +01:00
_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	…