From ad13323d241d79c77abaa93b4e4ef6dea892f921 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <mrdillon@alaska.edu>
Date: Tue, 31 Mar 2015 09:06:26 -0800
Subject: [PATCH] ember-cli 0.2.2

---
 .editorconfig |  1 +
 .travis.yml   |  2 ++
 bower.json    |  8 ++++----
 package.json  | 15 ++++++---------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 2fe4874..47c5438 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -18,6 +18,7 @@ indent_style = space
 indent_size = 2
 
 [*.hbs]
+insert_final_newline = false
 indent_style = space
 indent_size = 2
 
diff --git a/.travis.yml b/.travis.yml
index cf23938..70a305e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 ---
 language: node_js
+node_js:
+  - "0.12"
 
 sudo: false
 
diff --git a/bower.json b/bower.json
index 6853cc1..e3f4047 100644
--- a/bower.json
+++ b/bower.json
@@ -2,14 +2,14 @@
   "name": "hymenobacterdotinfo",
   "dependencies": {
     "jquery": "~2.1.1",
-    "ember": "1.10.0",
-    "ember-data": "1.0.0-beta.15",
-    "ember-resolver": "~0.1.12",
+    "ember": "1.11.0",
+    "ember-data": "1.0.0-beta.16.1",
+    "ember-resolver": "~0.1.15",
     "loader.js": "ember-cli/loader.js#3.2.0",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
     "ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
-    "ember-qunit": "0.2.8",
+    "ember-qunit": "0.3.0",
     "ember-qunit-notifications": "0.0.7",
     "qunit": "~1.17.1",
     "flakes": "~1.0.0",
diff --git a/package.json b/package.json
index dc4295e..6103c89 100644
--- a/package.json
+++ b/package.json
@@ -20,12 +20,11 @@
   "license": "MIT",
   "devDependencies": {
     "body-parser": "^1.12.2",
-    "broccoli-asset-rev": "^2.0.0",
-    "connect-restreamer": "^1.0.1",
-    "ember-cli": "0.2.0",
-    "ember-cli-app-version": "0.3.2",
+    "broccoli-asset-rev": "^2.0.2",
+    "ember-cli": "0.2.2",
+    "ember-cli-app-version": "0.3.3",
     "ember-cli-babel": "^4.0.0",
-    "ember-cli-content-security-policy": "0.3.0",
+    "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "0.0.8",
     "ember-cli-divshot": "^0.1.7",
     "ember-cli-htmlbars": "0.7.4",
@@ -35,13 +34,11 @@
     "ember-cli-simple-auth": "^0.7.2",
     "ember-cli-simple-auth-token": "^0.6.0",
     "ember-cli-uglify": "1.0.1",
-    "ember-data": "1.0.0-beta.15",
+    "ember-data": "1.0.0-beta.16.1",
     "ember-export-application-global": "^1.0.2",
     "express": "^4.12.3",
     "glob": "^4.5.3",
-    "morgan": "^1.5.2"
-  },
-  "dependencies": {
+    "morgan": "^1.5.2",
     "jsonwebtoken": "^4.2.1"
   }
 }