Merge pull request #473 from ebryn/gj/ember-2.18.2

ember 2.18.2
ebryn · Apr 16, 2018 · f6ff799 · f6ff799
2 parents df2e128 + 44bcc5b
commit f6ff799
Show file tree

Hide file tree

Showing 18 changed files with 4,138 additions and 229 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -25,6 +25,7 @@
         "expect",
         "minispade",
         "expectAssertion",
+        "createOwner",
         "QUnit"
     ],
 

diff --git a/bower.json b/bower.json
@@ -3,7 +3,7 @@
   "version": "0.0.18",
   "main": "ember-model.js",
   "dependencies": {
-    "ember": "2.8.3"
+    "ember": "2.18.2"
   },
   "devDependencies": {
     "qunit": "~2.5"

diff --git a/ember-model.js b/ember-model.js
@@ -2128,4 +2128,4 @@ Ember.onLoad('Ember.Application', function(Application) {
 });
 
 
-})();
+})();