diff options
author | Erik Johnston <erik@matrix.org> | 2014-10-27 10:20:44 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-10-27 10:20:44 +0000 |
commit | bb4a20174cb9128a1d9d5b7bd3d11d98b070edb6 (patch) | |
tree | f7ea571aedd4f1c8ae74a7c9ba3356a6c2107351 /synapse/__init__.py | |
parent | It doesn't want a dict (diff) | |
parent | Add log message if we can't enable ECC. Require pyopenssl>=0.14 since 0.13 do... (diff) | |
download | synapse-bb4a20174cb9128a1d9d5b7bd3d11d98b070edb6.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
Conflicts: synapse/federation/transport.py synapse/handlers/message.py
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 a340a5db66..7067188c5b 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a synapse home server. """ -__version__ = "0.3.4" +__version__ = "0.4.1" |