Luke "Jared" Bennett 12fbce2eac Merge branch 'master' into 'add-sentry-js-again-with-vue' ... # Conflicts: # db/schema.rb		2017-05-04 22:48:21 +00:00
..
images	Renamed notfound favicon name	2017-05-01 14:42:37 +01:00
javascripts	Merge branch 'master' into 'add-sentry-js-again-with-vue'	2017-05-04 22:48:21 +00:00
stylesheets	Merge branch '31271-fixmr-target-branch-selector-dropdown' into 'master'	2017-05-04 18:45:22 +00:00