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
..
uploads_controller_spec.rb	Merge branch 'master' into extend_markdown_upload	2015-02-24 14:54:39 +01:00