Merge a621ffe into 12aa34f

js-data · May 13, 2014 · e4f0765 · e4f0765
2 parents 12aa34f + a621ffe
commit e4f0765
Show file tree

Hide file tree

Showing 22 changed files with 349 additions and 208 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+##### 0.9.0 - xx May 2014
+
+###### Backwards compatible API changes
+- #30, #48 - DSCacheFactory integration
+
 ##### 0.8.1 - 02 May 2014
 
 ###### Backwards compatible Bug fixes

diff --git a/bower.json b/bower.json
@@ -2,8 +2,8 @@
   "author": "Jason Dobry",
   "name": "angular-data",
   "description": "Data store for Angular.js.",
-  "version": "0.8.1",
-  "homepage": "http://jmdobry.github.io/angular-data/",
+  "version": "0.9.0-SNAPSHOT",
+  "homepage": "http://angular-data.codetrain.io/",
   "repository": {
     "type": "git",
     "url": "git://github.com/jmdobry/angular-data.git"
@@ -30,8 +30,5 @@
     "angular-mocks": "~1.2.16",
     "angular-cache": "~3.0.0-beta.4",
     "observe-js": "~0.2.0"
-  },
-  "resolutions": {
-    "angular": "~1.2.16"
   }
 }