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
..
_common.html.haml	Merge branch 'master' into rails-4.1.9	2015-02-19 20:53:05 -07:00
_created_project.html.haml	Make sure twitter widgets are loaded when rendered through turbolinks.	2015-02-14 13:32:05 +01:00
_note.html.haml	Split up AttachmentUploader.	2015-02-20 15:19:50 +01:00
_push.html.haml	Merge branch 'master' into rails-4.1.9	2015-02-19 20:53:05 -07:00