summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-01-30 17:04:08 +0000
committerErik Johnston <erik@matrix.org>2019-01-30 17:04:08 +0000
commit62962e30e48c10cbbe4f52a2866c97c4845c0abb (patch)
tree573aac67b1fc9c7cdc8e1bb3dc51e1136ea2c549 /synapse/__init__.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge remote-tracking branch 'origin/release-v0.99.0' into develop (diff)
downloadsynapse-62962e30e48c10cbbe4f52a2866c97c4845c0abb.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
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"