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 |
||
---|---|---|
.. | ||
commits | ||
issues | ||
source | ||
active_tab.feature | ||
create_project.feature | ||
hooks.feature | ||
merge_requests.feature | ||
network.feature | ||
project.feature | ||
team_management.feature | ||
wall.feature | ||
wiki.feature |