9e9ce95d62
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 |
||
---|---|---|
.. | ||
discussions | ||
_commit_discussion.html.haml | ||
_diff_notes_with_reply.html.haml | ||
_diff_notes_with_reply_parallel.html.haml | ||
_discussion.html.haml | ||
_edit_form.html.haml | ||
_form.html.haml | ||
_form_errors.html.haml | ||
_note.html.haml | ||
_notes.html.haml | ||
_notes_with_form.html.haml |