summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-06-11 13:27:27 +0100
committerBrendan Abolivier <babolivier@matrix.org>2020-06-11 13:27:27 +0100
commit3b3f327a0d73f81609399d194a13b42fd01e85f7 (patch)
treefe437819faf5d7e1173b41388ac2973cc0c342d1
parentMerge branch 'release-v1.15.0' of github.com:matrix-org/synapse into release-... (diff)
downloadsynapse-3b3f327a0d73f81609399d194a13b42fd01e85f7.tar.xz
-rw-r--r--CHANGES.md6
-rw-r--r--debian/changelog6
-rw-r--r--synapse/__init__.py2
3 files changed, 13 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md

index 02dea27e14..4a356442e3 100644 --- a/CHANGES.md +++ b/CHANGES.md
@@ -1,3 +1,9 @@ +Synapse 1.15.0 (2020-06-11) +=========================== + +No significant changes. + + Synapse 1.15.0rc1 (2020-06-09) ============================== diff --git a/debian/changelog b/debian/changelog
index f50a102b04..182a50ee37 100644 --- a/debian/changelog +++ b/debian/changelog
@@ -1,3 +1,9 @@ +matrix-synapse-py3 (1.15.0) stable; urgency=medium + + * New synapse release 1.15.0. + + -- Synapse Packaging team <packages@matrix.org> Thu, 11 Jun 2020 13:27:06 +0100 + matrix-synapse-py3 (1.14.0) stable; urgency=medium * New synapse release 1.14.0. diff --git a/synapse/__init__.py b/synapse/__init__.py
index 39c3a3ba4d..1d9d85a727 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.15.0rc1" +__version__ = "1.15.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