diff options
author | Amber Brown <hawkowl@atleastfornow.net> | 2018-10-04 22:41:52 +1000 |
---|---|---|
committer | Amber Brown <hawkowl@atleastfornow.net> | 2018-10-04 22:41:52 +1000 |
commit | d86794325f770f4d4e9a13a993809a53b58d9122 (patch) | |
tree | 42b83cb83e654a1bb89d5da4a2c69ac843ed2ee9 /synapse/__init__.py | |
parent | Merge pull request #3999 from matrix-org/erikj/fix_3pid_invite_rejetion (diff) | |
parent | changelog (diff) | |
download | synapse-d86794325f770f4d4e9a13a993809a53b58d9122.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/__init__.py')
-rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index b1f7a89fba..43c5821ade 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -27,4 +27,4 @@ try: except ImportError: pass -__version__ = "0.33.5.1" +__version__ = "0.33.6" |