changeset 155 | 76ae75975ee2 |
parent 148 | 6b32182a7fba |
child 156 | 7203efa0ddbf |
--- a/cms/app-client/bower.json Sun Apr 24 22:38:10 2016 +0200 +++ b/cms/app-client/bower.json Mon Apr 25 12:53:47 2016 +0200 @@ -1,7 +1,7 @@ { "name": "app-client", "dependencies": { - "ember": "~2.4.3", + "ember": "~2.5.0", "ember-cli-shims": "0.1.1", "ember-cli-test-loader": "0.2.2", "ember-qunit-notifications": "0.1.0", @@ -14,8 +14,5 @@ "lodash": "~3.7.0", "Faker": "~3.0.0", "store": "https://github.com/marcuswestin/store.js.git#v1.3.20" - }, - "resolutions": { - "jquery": "^2.2" } }