From ecb69d824a39d420a20a1c0b24a7174cea392560 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Thu, 3 Oct 2019 13:22:44 +0100
Subject: [PATCH] 1.4.0

---
 CHANGES.md              | 9 +++++++++
 changelog.d/6158.bugfix | 1 -
 debian/changelog        | 6 ++++++
 synapse/__init__.py     | 2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)
 delete mode 100644 changelog.d/6158.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index 78322a08c..165e1d4db 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.4.0 (2019-10-03)
+==========================
+
+Bugfixes
+--------
+
+- Redact `client_secret` in server logs. ([\#6158](https://github.com/matrix-org/synapse/issues/6158))
+
+
 Synapse 1.4.0rc2 (2019-10-02)
 =============================
 
diff --git a/changelog.d/6158.bugfix b/changelog.d/6158.bugfix
deleted file mode 100644
index 6b48fce05..000000000
--- a/changelog.d/6158.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Redact `client_secret` in server logs.
diff --git a/debian/changelog b/debian/changelog
index 76efc442d..60c682cc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.4.0) stable; urgency=medium
+
+  * New synapse release 1.4.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Thu, 03 Oct 2019 13:22:25 +0100
+
 matrix-synapse-py3 (1.3.1) stable; urgency=medium
 
   * New synapse release 1.3.1.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 5197eea22..2d52d26af 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -35,4 +35,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.4.0rc2"
+__version__ = "1.4.0"