summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorAmber H. Brown <hawkowl@atleastfornow.net>2019-07-03 22:39:30 +1000
committerAmber H. Brown <hawkowl@atleastfornow.net>2019-07-03 22:39:30 +1000
commitf4343c7d2bbde2d4b9674a029867bbe0353616e4 (patch)
tree44b29f777ae1418b1c858e2aa7cbbece06bafc70 /synapse/__init__.py
parentMerge remote-tracking branch 'origin/develop' into shhs (diff)
parent1.1.0rc2 (diff)
downloadsynapse-f4343c7d2bbde2d4b9674a029867bbe0353616e4.tar.xz
Merge remote-tracking branch 'origin/develop' into shhs
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..5fe8631973 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -35,4 +35,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.0.0"
+__version__ = "1.1.0rc2"