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 |
||
---|---|---|
.. | ||
_commit.html.haml | ||
_commit_box.html.haml | ||
_commits.html.haml | ||
_diff_head.html.haml | ||
_diffs.html.haml | ||
_head.html.haml | ||
_text_diff.html.haml | ||
show.atom.builder | ||
show.html.haml | ||
show.js.haml |