app/views/projects/notes · 38c52b1be6ca05862db0f7e8c4931bebc873bf75 · Forest Godfrey / gitlab-ce

Merge branch 'master' into extend_markdown_upload · 0283fff5

authored Feb 24, 2015

# 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

0283fff5

Name	Last commit	Last update
..
discussions		Loading commit data...
_commit_discussion.html.haml		Loading commit data...
_diff_notes_with_reply.html.haml		Loading commit data...
_diff_notes_with_reply_parallel.html.haml		Loading commit data...
_discussion.html.haml		Loading commit data...
_edit_form.html.haml		Loading commit data...
_form.html.haml		Loading commit data...
_form_errors.html.haml		Loading commit data...
_note.html.haml		Loading commit data...
_notes.html.haml		Loading commit data...
_notes_with_form.html.haml		Loading commit data...