From 0cfc7b85e70b526d6c2f622973ac36a3c4e4d226 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Mon, 23 Mar 2015 18:39:10 +0100
Subject: [PATCH] Update to ember 1.11 beta5

---
 bower.json   |  6 +++---
 package.json | 29 ++++++++++++++---------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/bower.json b/bower.json
index 8e2933a2..1349d146 100644
--- a/bower.json
+++ b/bower.json
@@ -3,14 +3,14 @@
   "dependencies": {
     "handlebars": "2.0.0",
     "jquery": "^1.11.1",
-    "ember": "1.10.0",
-    "ember-data": "1.0.0-beta.14",
+    "ember": "1.11.0-beta.5",
+    "ember-data": "1.0.0-beta.15",
     "ember-resolver": "~0.1.11",
     "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.0",
     "ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
-    "ember-qunit": "0.1.8",
+    "ember-qunit": "0.2.5",
     "ember-qunit-notifications": "0.0.5",
     "qunit": "~1.17.1",
     "visibilityjs": "~1.2.1",
diff --git a/package.json b/package.json
index 5541d5cc..a1cd070f 100644
--- a/package.json
+++ b/package.json
@@ -20,25 +20,24 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.0.0",
-    "broccoli-sass": "0.3.3",
-    "ember-cli": "^0.2.0",
-    "ember-cli-6to5": "^3.0.0",
-    "ember-cli-autoprefixer": "^0.3.0",
-    "ember-cli-coffeescript": "0.7.0",
+    "ember-cli": "0.2.0",
+    "ember-cli-app-version": "0.3.2",
+    "ember-cli-babel": "^4.0.0",
     "ember-cli-content-security-policy": "0.3.0",
-    "ember-cli-dependency-checker": "0.0.7",
-    "ember-cli-document-title": "0.0.1",
-    "ember-cli-htmlbars": "^0.7.0",
+    "ember-cli-dependency-checker": "0.0.8",
+    "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.9",
+    "ember-cli-uglify": "1.0.1",
+    "ember-data": "1.0.0-beta.15",
+    "ember-export-application-global": "^1.0.2",
+    "broccoli-sass": "0.3.3",
+    "ember-cli-autoprefixer": "^0.3.0",
+    "ember-cli-coffeescript": "0.10.0",
+    "ember-cli-document-title": "0.0.1",
     "ember-cli-inline-images": "^0.0.4",
     "ember-cli-pretender": "0.3.1",
-    "ember-cli-qunit": "0.3.0",
-    "ember-cli-sauce": "0.0.7",
-    "ember-cli-uglify": "1.0.1",
-    "ember-data": "1.0.0-beta.12",
-    "ember-export-application-global": "^1.0.0",
-    "express": "^4.8.5",
-    "glob": "^4.0.5"
+    "ember-cli-sauce": "^0.0.7"
   }
 }