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
..
discussions	Upgrade to Rails 4.1.9	2015-02-14 11:09:23 -07:00
_commit_discussion.html.haml	…
_diff_notes_with_reply.html.haml	Upgrade to Font Awesome v4.2	2014-10-03 12:19:24 +02:00
_diff_notes_with_reply_parallel.html.haml	Upgrade to Font Awesome v4.2	2014-10-03 12:19:24 +02:00
_discussion.html.haml	Round avatars for notes timeline	2014-08-26 11:30:15 +03:00
_edit_form.html.haml	Merge branch 'master' into extend_markdown_upload	2015-02-24 14:54:39 +01:00
_form.html.haml	Merge branch 'master' into extend_markdown_upload	2015-02-24 14:54:39 +01:00
_form_errors.html.haml	…
_note.html.haml	Merge branch 'master' into extend_markdown_upload	2015-02-24 14:54:39 +01:00
_notes.html.haml	…
_notes_with_form.html.haml	Upgrade to Rails 4.1.9	2015-02-14 11:09:23 -07:00