jelhan 018fcf7f1f Merge branch 'master' into feat/i18n ... Conflicts: app/index.html app/templates/create/options.hbs bower.json		2014-10-19 23:52:39 +02:00
..
.gitkeep	Starting to move to Ember App Kit	2014-07-06 17:37:54 +02:00
ember-easyForm.js	bootstrap 3 for ember-easyForm	2014-10-18 22:12:00 +02:00
inject-encryption-key.js	Starting to move to Ember App Kit	2014-07-06 17:37:54 +02:00
translations.js	some small fixes	2014-09-29 13:17:54 +02:00