• Douwe Maan's avatar
    Merge branch 'master' into faster-diffs · 5a8f727f
    Douwe 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
_text_file.html.haml 868 Bytes