Skip to content

Commit 3efe00e

Browse files
committed
Merge branch 'master' into v2
Conflicts: CHANGELOG.md README.md bower.json dist/angular-data.js dist/angular-data.min.js guide/home.html guide/nav.html package.json src/datastore/index.js src/index.js
2 parents 5467830 + 7ae1170 commit 3efe00e

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
###### Breaking API changes
44
- Refactored to be a wrapper for [js-data](https://github.com/js-data/js-data)
55

6+
##### 1.0.0 - 04 October 2014
7+
8+
Stable Version 1.0.0
9+
610
##### 1.0.0-rc.2-1 - 25 September 2014
711

812
###### Backwards compatible bug fixes

0 commit comments

Comments
 (0)