summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-09-06 14:08:55 +0100
committerErik Johnston <erik@matrix.org>2018-09-06 14:08:55 +0100
commit417e7077aadb9f9832dabb0fa93e39e58df92a8a (patch)
treefda260c8585a01f3f3a3bac403375f5c54ff8a05
parentMerge tag 'v0.33.3.1' into release-v0.33.4 (diff)
downloadsynapse-417e7077aadb9f9832dabb0fa93e39e58df92a8a.tar.xz
Bump version and changelog
-rw-r--r--CHANGES.md6
-rw-r--r--synapse/__init__.py2
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md

index 4db47da3e3..fecfa7feec 100644 --- a/CHANGES.md +++ b/CHANGES.md
@@ -1,3 +1,9 @@ +Synapse 0.33.4rc2 (2018-09-06) +============================== + +Pull in security fixes from v0.33.3.1 + + Synapse 0.33.3.1 (2018-09-06) ============================= diff --git a/synapse/__init__.py b/synapse/__init__.py
index 2c42893673..063c304534 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -17,4 +17,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.33.4rc1" +__version__ = "0.33.4rc2"