Mike Greiling c62fe6a293 refactor merge conflicts bundle to reduce side effects		2018-02-27 16:53:49 -06:00
..
components	Replace $.get in diff file editor with axios	2018-02-02 14:22:13 -06:00
mixins
merge_conflict_service.js	Convert merge_conflict_service.js to axios	2018-01-30 16:47:19 +00:00
merge_conflict_store.js	fix conflict pluralized	2017-07-24 17:11:12 +02:00
merge_conflicts_bundle.js	refactor merge conflicts bundle to reduce side effects	2018-02-27 16:53:49 -06:00