From 127629d4f7c770008b51368835fff2af9473f79c Mon Sep 17 00:00:00 2001
From: Florent Vilmart <flovilmart@users.noreply.github.com>
Date: Mon, 28 Nov 2016 16:42:41 -0500
Subject: [PATCH] Changelog 2.2.25 (#3134)

---
 CHANGELOG.md | 16 +++++++++++++++-
 package.json |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f348f0e6..c49dc906 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,31 @@
 ## Parse Server Changelog
 
-### 2.2.25-beta.1
+### 2.2.25
 
 Postgres support requires v9.5
 
 #### New Features
+* Dockerizing Parse Server, thanks to [Kirill Kravinsky](https://github.com/woyorus)
+* Login with qq, wechat, weibo, thanks to [haifeizhang]()
+* Password policy, validation and expiration, thanks to [Bhaskar Reddy Yasa](https://github.com/bhaskaryasa)
 * Health check on /health, thanks to [Kirill Kravinsky](https://github.com/woyorus)
 * Reuse SchemaCache across requests option, thanks to [Steven Shipton](https://github.com/steven-supersolid)
 
 #### Improvements
+* Better support for CLI options, thanks to [Steven Shipton](https://github.com/steven-supersolid)
+* Specity a database timeout with maxTimeMS, thanks to [Tyler Brock](https://github.com/TylerBrock)
+* Adds the username to reset password success pages, thanks to [Halim Qarroum](https://github.com/HQarroum)
 * Better support for Redis cache adapter, thanks to [Tyler Brock](https://github.com/TylerBrock)
 * Better coverage of Postgres, thanks to [Kulshekhar Kabra](https://github.com/kulshekhar)
 
+#### Bug Fixes
+* Fixes issue when sending push to multiple installations, thanks to [Florent Vilmart](https://github.com/flovilmart)
+* Fixes issues with twitter authentication, thanks to [jonas-db](https://github.com/jonas-db)
+* Ignore createdAt fields update, thanks to [Yuki Takeichi](https://github.com/yuki-takeichi)
+* Improve support for array equality with LiveQuery, thanks to [David Poetzsch-Heffter](https://github.com/dpoetzsch)
+* Improve support for batch endpoint when serverURL and publicServerURL have different paths, thanks to [Florent Vilmart](https://github.com/flovilmart)
+* Support saving relation objects, thanks to [Yuki Takeichi](https://github.com/yuki-takeichi)
+
 ### 2.2.24
 
 #### New Features
diff --git a/package.json b/package.json
index 44ddea32..25d18c1c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parse-server",
-  "version": "2.2.25-beta.1",
+  "version": "2.2.25",
   "description": "An express module providing a Parse-compatible API server",
   "main": "lib/index.js",
   "repository": {