db2c15369c
Conflicts: app/assets/stylesheets/main.scss app/models/project.rb app/views/notes/_common_form.html.haml app/views/notes/_per_line_form.html.haml lib/gitlab/markdown.rb spec/models/note_spec.rb |
||
---|---|---|
.. | ||
_diff_note_link.html.haml | ||
_diff_notes_with_reply.html.haml | ||
_discussion.html.haml | ||
_discussion_diff.html.haml | ||
_discussion_reply_button.html.haml | ||
_form.html.haml | ||
_form_errors.html.haml | ||
_note.html.haml | ||
_notes.html.haml | ||
_notes_with_form.html.haml | ||
_reversed_notes_with_form.html.haml | ||
create.js.haml | ||
index.js.haml |