From 9c1b83b0078aa9cc1bb902e14d3f7302625ba099 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 21 Feb 2020 08:56:04 +0000
Subject: [PATCH] 1.11.0
---
CHANGES.md | 9 +++++++++
changelog.d/6944.doc | 1 -
debian/changelog | 6 ++++++
synapse/__init__.py | 2 +-
4 files changed, 16 insertions(+), 2 deletions(-)
delete mode 100644 changelog.d/6944.doc
diff --git a/CHANGES.md b/CHANGES.md
index fabf909fa3..ff681762cd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.11.0 (2020-02-21)
+===========================
+
+Improved Documentation
+----------------------
+
+- Small grammatical fixes to the ACME v1 deprecation notice. ([\#6944](https://github.com/matrix-org/synapse/issues/6944))
+
+
Synapse 1.11.0rc1 (2020-02-19)
==============================
diff --git a/changelog.d/6944.doc b/changelog.d/6944.doc
deleted file mode 100644
index eb0c534b56..0000000000
--- a/changelog.d/6944.doc
+++ /dev/null
@@ -1 +0,0 @@
-Small grammatical fixes to the ACME v1 deprecation notice.
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 90314d36af..fbb44cb94b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.11.0) stable; urgency=medium
+
+ * New synapse release 1.11.0.
+
+ -- Synapse Packaging team <packages@matrix.org> Fri, 21 Feb 2020 08:54:34 +0000
+
matrix-synapse-py3 (1.10.1) stable; urgency=medium
* New synapse release 1.10.1.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 076a297b87..3406ce634f 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
except ImportError:
pass
-__version__ = "1.11.0rc1"
+__version__ = "1.11.0"
if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
# We import here so that we don't have to install a bunch of deps when
--
GitLab