Skip to content
  • Douwe Maan's avatar
    Merge branch 'master' into extend_markdown_upload · aae6d147b8dc
    Douwe Maan authored
    # 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
    aae6d147b8dc