gitlab-org--gitlab-foss/app/views/projects/notes
Vinnie Okada 9e9ce95d62 Merge branch 'master' into rails-4.1.9
Conflicts:
	app/views/dashboard/_project.html.haml
	app/views/events/event/_common.html.haml
	app/views/explore/projects/_project.html.haml
	app/views/groups/_projects.html.haml
	app/views/projects/_home_panel.html.haml
	app/views/projects/_issues_nav.html.haml
	app/views/projects/issues/_discussion.html.haml
	app/views/projects/issues/_issues.html.haml
	app/views/projects/issues/show.html.haml
	app/views/projects/merge_requests/_discussion.html.haml
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/milestones/index.html.haml
	app/views/projects/notes/_edit_form.html.haml
	app/views/shared/_issuable_filter.html.haml
2015-02-19 20:53:05 -07: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 rails-4.1.9 2015-02-19 20:53:05 -07:00
_form.html.haml Merge branch 'master' into rails-4.1.9 2015-02-19 20:53:05 -07:00
_form_errors.html.haml
_note.html.haml Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
_notes.html.haml
_notes_with_form.html.haml Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00