Piotr Sarnacki 24d18afd48 Merge branch 'css-refactor' into ember-cli ... Conflicts: app/templates/layouts/profile.hbs assets/scripts/app/routes.coffee assets/scripts/app/views.coffee		2015-02-05 12:49:26 +01:00
..
dashboard.hbs	Merge branch 'css-refactor' into ember-cli	2015-02-05 12:49:26 +01:00
flash.hbs	Remove Travis global usage from templates	2015-02-04 18:34:25 +01:00
home.hbs	Merge branch 'css-refactor' into ember-cli	2015-02-05 12:49:26 +01:00
profile.hbs	Merge branch 'css-refactor' into ember-cli	2015-02-05 12:49:26 +01:00
simple.hbs	Move assets/scripts/app to root dir	2015-02-03 09:44:34 +01:00
support.hbs	Change config keys to camel case	2015-02-05 11:35:47 +01:00