Merge pull request #4334 from bmac/update-changelog-master

Port the 2.5.x changelog entires to master
emberjs · Apr 15, 2016 · f9addb8 · f9addb8
2 parents 9a5e796 + ae99a24
commit f9addb8
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 ### Master
 
+### Release 2.5.2 (April 14, 2016)
+- [#4328](https://github.com/emberjs/data/pull/4328) [BUGFIX release] Only setup babel options once.
+- [#4333](https://github.com/emberjs/data/pull/4333) [BUGFIX release] use es5 syntax for addon's index.js file
+
+### Release 2.5.1 (April 12, 2016)
+- [#4320](https://github.com/emberjs/data/pull/4320) [BUGFIX release] Ensure feature flag stripping works for all builds.
+
 ### Release 2.5.0 (April 11, 2016)
 - [#4293](https://github.com/emberjs/data/pull/4293) Transition an invalid created record to the deleted saved state when deleted
 - [#4304](https://github.com/emberjs/data/pull/4304) pass DS.SnapshotRecordArray to build-url-mixin buildURL