diff -r eadaf0b8f02e -r a9b98b16b053 server/bo_client/bower.json --- a/server/bo_client/bower.json Fri Nov 27 17:59:36 2015 +0100 +++ b/server/bo_client/bower.json Tue Dec 01 13:33:08 2015 +0100 @@ -1,16 +1,25 @@ { "name": "bo-client", "dependencies": { - "ember": "2.1.0", - "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3", + "ember": "2.2.0", + "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.6", "ember-cli-test-loader": "ember-cli-test-loader#0.1.3", "ember-data": ">=2.1.0", - "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5", - "ember-qunit": "0.4.9", - "ember-qunit-notifications": "0.0.7", - "ember-resolver": "~0.1.18", + "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.7", + "ember-qunit": ">=0.4.9", + "ember-qunit-notifications": ">=0.0.7", + "ember-resolver": ">=0.1.18", "jquery": "latest", - "loader.js": "ember-cli/loader.js#3.2.1", - "qunit": "~1.18.0" + "loader.js": "ember-cli/loader.js#3.5.0", + "qunit": "~1.18.0", + "bootstrap-sass": "bootstrap-sass-official#~3.3.6", + "font-awesome": "~4.4.0" + }, + "resolutions": { + "ember-cli-shims": "0.0.6", + "loader.js": "3.5.0", + "ember-load-initializers": "0.1.7", + "ember": "2.2.0", + "qunit-notifications": "~0.1.0" } }