Update ember to 2.2.0-beta.1

This commit is contained in:
Szymon Nowak 2015-10-06 08:35:15 +02:00
parent ad6c4f2949
commit 9484c449b7
2 changed files with 5 additions and 7 deletions

View File

@ -1,9 +1,10 @@
/* jshint -W030 */
import Ember from 'ember';
import config from 'share-drop/config/environment';
import FileSystem from '../services/file';
import Analytics from '../services/analytics';
export function initialize(container, application) {
export function initialize(application) {
application.deferReadiness();
checkWebRTCSupport()

View File

@ -1,20 +1,17 @@
{
"name": "share-drop",
"dependencies": {
"ember": "2.1.0-beta.4",
"ember": "2.2.0-beta.1",
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.6",
"ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.7",
"ember-qunit": "0.4.9",
"ember-qunit-notifications": "0.0.7",
"jquery": "^1.11.3",
"jquery": "^2.1.4",
"loader.js": "ember-cli/loader.js#3.2.1",
"qunit": "~1.18.0"
},
"devDependencies": {
"bootstrap": "~3.3.1"
},
"resolutions": {
"ember": "2.1.0-beta.4"
}
}