summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js
Commit message (Expand)AuthorAgeFilesLines
* remove Vue from the global spaceMike Greiling2017-03-201-1/+2
* Remove .es6 from file extensions (!9241)winniehell2017-03-051-0/+96