Merge pull request #10 from jschilli/ember-cli-0.2.0

Upgrade to ember-cli 0.2.0
kimroen · Mar 14, 2015 · f27a062 · f27a062
2 parents 75d8e9d + bc2b311
commit f27a062
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/bower.json b/bower.json
@@ -4,7 +4,7 @@
     "jquery": "^1.11.1",
     "ember": "1.10.0",
     "ember-data": "1.0.0-beta.15",
-    "ember-resolver": "~0.1.11",
+    "ember-resolver": "~0.1.12",
     "loader.js": "ember-cli/loader.js#1.0.1",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.3",

diff --git a/package.json b/package.json
@@ -26,12 +26,12 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.0.0",
-    "ember-cli": "0.2.0-beta.1",
+    "ember-cli": "^0.2.0",
     "ember-cli-app-version": "0.3.1",
     "ember-cli-babel": "^4.0.0",
     "ember-cli-content-security-policy": "0.3.0",
     "ember-cli-dependency-checker": "0.0.7",
-    "ember-cli-htmlbars": "0.7.4",
+    "ember-cli-htmlbars": "^0.7.4",
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-qunit": "0.3.8",