From bb1efd6733feadd2e1e933eee1701dd4424b704e Mon Sep 17 00:00:00 2001
From: Matthew Dillon <mrdillon@alaska.edu>
Date: Wed, 25 Nov 2015 21:47:51 -0700
Subject: [PATCH] ember 2.2.0 & ember-data 2.2.1
---
bower.json | 4 ++--
package.json | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/bower.json b/bower.json
index 98f5857..754a919 100644
--- a/bower.json
+++ b/bower.json
@@ -2,10 +2,10 @@
"name": "hymenobacterdotinfo",
"dependencies": {
"jquery": "~2.1.1",
- "ember": "~2.1.0",
+ "ember": "~2.2.0",
"ember-cli-shims": "0.0.6",
"ember-cli-test-loader": "0.2.1",
- "ember-data": "~2.1.0",
+ "ember-data": "~2.2.1",
"ember-load-initializers": "0.1.7",
"ember-qunit": "0.4.16",
"ember-qunit-notifications": "~0.1.0",
diff --git a/package.json b/package.json
index 071bc25..068da15 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
"ember-cli-release": "0.2.8",
"ember-cli-sri": "^1.1.0",
"ember-cli-uglify": "^1.2.0",
- "ember-data": "1.13.15",
+ "ember-data": "~2.2.1",
"ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "^1.0.4",
"ember-one-way-input": "0.1.3",