1.18.0
4 files changed, 16 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 2ecbd3fd00..b8c636ebe0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.18.0 (2020-07-30)
+===========================
+
+Improved Documentation
+----------------------
+
+- Update worker docs with latest enhancements. ([\#7969](https://github.com/matrix-org/synapse/issues/7969))
+
+
Synapse 1.18.0rc2 (2020-07-28)
==============================
diff --git a/changelog.d/7969.doc b/changelog.d/7969.doc
deleted file mode 100644
index 68d2ed5fad..0000000000
--- a/changelog.d/7969.doc
+++ /dev/null
@@ -1 +0,0 @@
-Update worker docs with latest enhancements.
diff --git a/debian/changelog b/debian/changelog
index 3825603ae4..a6d88906ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.18.0) stable; urgency=medium
+
+ * New synapse release 1.18.0.
+
+ -- Synapse Packaging team <packages@matrix.org> Thu, 30 Jul 2020 10:55:53 +0100
+
matrix-synapse-py3 (1.17.0) stable; urgency=medium
* New synapse release 1.17.0.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 83ce2ae6f4..5155e719a1 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
except ImportError:
pass
-__version__ = "1.18.0rc2"
+__version__ = "1.18.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
|
