Merge branch 'master' into develop

CHANGES.md

@@ -11,6 +11,13 @@ Next version
   should update to using the async/await version `complete_sso_login_async` which
   includes additional checks. The non-async version is considered deprecated.
 
+
+Synapse 1.12.4 (2020-04-23)
+===========================
+
+No significant changes.
+
+
 Synapse 1.12.4rc1 (2020-04-22)
 ==============================
 

debian/changelog

@@ -1,8 +1,16 @@
+<<<<<<< HEAD
 matrix-synapse-py3 (1.12.3ubuntu1) UNRELEASED; urgency=medium
 
   * Add information about .well-known files to Debian installation scripts.
 
  -- Patrick Cloke <patrickc@matrix.org>  Mon, 06 Apr 2020 10:10:38 -0400
+=======
+matrix-synapse-py3 (1.12.4) stable; urgency=medium
+
+  * New synapse release 1.12.4.
+
+ -- Synapse Packaging team <packages@matrix.org>  Thu, 23 Apr 2020 10:58:14 -0400
+>>>>>>> master
 
 matrix-synapse-py3 (1.12.3) stable; urgency=medium
 

synapse/__init__.py

@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.12.4rc1"
+__version__ = "1.12.4"
 
 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