Jacob Schatz 4371f84564 Merge branch 'remove-merge-conflicts-bundle' into 'master' ... Remove merge_conflicts bundle See merge request gitlab-org/gitlab-ce!17408		2018-02-28 02:42:42 +00:00
..
images	Restore feature_highlight code	2018-02-05 12:10:09 -06:00
javascripts	Merge branch 'remove-merge-conflicts-bundle' into 'master'	2018-02-28 02:42:42 +00:00
stylesheets	Render MR Notes with Vue with behind a cookie	2018-02-28 00:10:43 +00:00