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/api/constants.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/api/constants.py')
0 files changed, 0 insertions, 0 deletions