Phil Hughes 8750507b5d Convert merge_conflict_service.js to axios		2018-01-30 16:47:19 +00:00
..
components	Flash is now a ES6 module	2017-10-10 10:14:22 +01:00
mixins	Remove .es6 from file extensions (!9241)	2017-03-05 21:22:40 +01:00
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	Convert merge_conflict_service.js to axios	2018-01-30 16:47:19 +00:00