4 commits

Author	SHA1	Message	Date
Phil Hughes	425dbdd222	fixed label subscription & merge conflicts	2017-07-26 11:13:35 +01:00
Mike Greiling	5bd549187a	update remaining uses of CJS syntax to ES module syntax	2017-05-16 15:52:40 -05:00
Mike Greiling	d9dedc36c3	remove Vue from the global space	2017-03-20 22:12:01 -05:00
winniehell	572f9782d5	Remove .es6 from file extensions (!9241)	2017-03-05 21:22:40 +01:00

Renamed from app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6 (Browse further)