Merge commit 'e8c36e527' into dinsic

* commit 'e8c36e527':
  1.15.2
  Correctly handle outliers as prev events over federation
  Ensure that HTML pages served from Synapse include headers to avoid embedding.

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/__init__.py b/synapse/__init__.py

index f5cd8271a6..c371e8f3c4 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.16.0rc1"
+__version__ = "1.15.2"
 
 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