From 695b5d950c0ce9b216f6041dc4a152cefb1b504c Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 23 Mar 2016 14:39:30 +0000
Subject: [PATCH] Prepare changelog for 0.4.0

---
 CHANGES.rst => CHANGELOG.md | 27 +++++++++++++++++++++++++++
 release.sh                  |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)
 rename CHANGES.rst => CHANGELOG.md (55%)

diff --git a/CHANGES.rst b/CHANGELOG.md
similarity index 55%
rename from CHANGES.rst
rename to CHANGELOG.md
index 8841801b..16faf875 100644
--- a/CHANGES.rst
+++ b/CHANGELOG.md
@@ -1,3 +1,30 @@
+Changes in [0.4.0](https://github.com/vector-im/vector-web/releases/tag/v0.4.0) (2016-03-23)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/vector-web/compare/v0.3.0...v0.4.0)
+
+ * Update to matrix-react-sdk 0.3.0; see
+   https://github.com/matrix-org/matrix-react-sdk/blob/master/CHANGELOG.md
+
+Other changes
+ * permalink button
+   [\#1232](https://github.com/vector-im/vector-web/pull/1232)
+ * make senderprofiles clickable
+   [\#1191](https://github.com/vector-im/vector-web/pull/1191)
+ * fix notif spam when logging in from a guest session by correctly logging out
+   first.
+   [\#1180](https://github.com/vector-im/vector-web/pull/1180)
+ * use new start_login_from_guest dispatch for cancellable logins from guest
+   accounts
+   [\#1165](https://github.com/vector-im/vector-web/pull/1165)
+ * Use then() chaining rather than manual callbacks
+   [\#1171](https://github.com/vector-im/vector-web/pull/1171)
+ * Remove trailing whitespace
+   [\#1163](https://github.com/vector-im/vector-web/pull/1163)
+ * Update the actions of default rules instead of overriding.
+   [\#1037](https://github.com/vector-im/vector-web/pull/1037)
+ * Update README to include `npm install` in react-sdk
+   [\#1137](https://github.com/vector-im/vector-web/pull/1137)
+
 Changes in vector v0.3.0 (2016-03-11)
 ======================================
  * Lots of new bug fixes and updates
diff --git a/release.sh b/release.sh
index 0bb66ff7..e8c68b90 100755
--- a/release.sh
+++ b/release.sh
@@ -9,4 +9,4 @@ set -e
 
 cd `dirname $0`
 
-exec ./node_modules/matrix-js-sdk/release.sh -z -c CHANGES.rst "$@"
+exec ./node_modules/matrix-js-sdk/release.sh -z "$@"