Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/beta'
Browse files Browse the repository at this point in the history
  • Loading branch information
rwjblue committed Mar 27, 2017
2 parents 0f5260e + a4fc9f1 commit e5f3a33
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions blueprints/app/files/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,23 @@
"broccoli-asset-rev": "^2.4.5",
"ember-ajax": "^2.4.1",
"ember-cli": "~<%= emberCLIVersion %>",
"ember-cli-app-version": "^2.0.0",
"ember-cli-app-version": "^3.0.0",
"ember-cli-babel": "^6.0.0-beta.3",
"ember-cli-dependency-checker": "^1.3.0",
"ember-cli-eslint": "^3.0.0",
"ember-cli-htmlbars": "^1.1.1",
"ember-cli-htmlbars-inline-precompile": "^0.4.0-beta.2",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-qunit": "^3.1.2",
"ember-cli-shims": "^1.0.2",
"ember-cli-shims": "^1.1.0",
"ember-cli-sri": "^2.1.0",
"ember-cli-uglify": "^1.2.0",
"ember-data": "^2.13.0-beta.1",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^0.6.0",
"ember-resolver": "^3.0.0",
"ember-load-initializers": "^1.0.0",
"ember-resolver": "^4.0.0",
"ember-source": "~2.13.0-beta.1",
"ember-welcome-page": "^2.0.2",
"ember-welcome-page": "^3.0.0",
"loader.js": "^4.2.3"
},
"engines": {
Expand Down

0 comments on commit e5f3a33

Please sign in to comment.