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 |
||
---|---|---|
.. | ||
_form.html.haml | ||
_head.html.haml | ||
_issues.html.haml | ||
_show.html.haml | ||
edit.html.haml | ||
index.atom.builder | ||
index.html.haml | ||
index.js.haml | ||
new.html.haml | ||
show.html.haml | ||
update.js.haml |