summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-07-02 12:05:33 +0100
committerRichard van der Hoff <richard@matrix.org>2019-07-02 12:05:33 +0100
commit24e48bc9ffaaef065d24d8d2de9d48fcf1be1ae4 (patch)
treefb41e26098e358f08a30c3af83aad9f06cae3e28 /synapse/__init__.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parenttweak changelog (diff)
downloadsynapse-24e48bc9ffaaef065d24d8d2de9d48fcf1be1ae4.tar.xz
Merge branch 'release-v1.1.0' 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 119359be68..a7d2008e82 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -35,4 +35,4 @@ try: except ImportError: pass -__version__ = "1.0.0" +__version__ = "1.1.0rc1"