lvuch 04d0fbdd3c merge conflicts		2017-01-05 11:03:05 -07:00
..
component.js	Ember 2.6 upgrade (#766)	2016-07-06 12:40:37 -07:00
template.hbs	merge conflicts	2017-01-05 11:03:05 -07:00