-
Merge branch 'master' into faster-diffs · 5a8f727fDouwe Maan authored
# Conflicts: # app/helpers/notes_helper.rb # app/views/projects/diffs/_line.html.haml # app/views/projects/diffs/_parallel_view.html.haml # app/views/projects/diffs/_text_file.html.haml # features/steps/shared/diff_note.rb
5a8f727f
To find the state of this project's repository at the time of any of these versions, check out
the tags.
×