summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-01-31 18:11:00 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-01-31 18:11:00 +0000
commitbbb97a35fdaf7193e22ceacb8c155038b66651d2 (patch)
treec166033c625605a56b3301dfdc74791f838a2a92 /synapse/__init__.py
parentlint (diff)
parentReject large transactions on federation (#4513) (diff)
downloadsynapse-bbb97a35fdaf7193e22ceacb8c155038b66651d2.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/room_upgrade_federatable
Diffstat (limited to 'synapse/__init__.py')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py

index d6a191ccc6..5da59aa924 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try: except ImportError: pass -__version__ = "0.34.1.1" +__version__ = "0.99.0rc2"