Merge pull request #2993 from emberjs/pr/2955

Bump ember to `1.11.1`
emberjs · Apr 12, 2015 · 92eb2c7 · 92eb2c7
2 parents 40cce02 + e698f5d
commit 92eb2c7
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/bower.json b/bower.json
@@ -2,16 +2,12 @@
   "name": "ember-data",
   "private": true,
   "dependencies": {
-    "ember": "~1.10.0"
+    "ember": "~1.11.1"
   },
   "devDependencies": {
     "qunit": "~1.17.0",
     "jquery": "~1.10.x",
-    "handlebars": ">= 2.0.0 < 3.0.0",
     "loader.js": "~1.0.0",
     "es5-shim": "~4.0.3"
-  },
-  "resolutions": {
-    "handlebars": ">= 2.0.0 < 3.0.0"
   }
 }