diff options
author | Erik Johnston <erik@matrix.org> | 2015-11-17 15:10:49 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-11-17 15:10:49 +0000 |
commit | 391f2aa56c54cee6001de415ae4609e15702629c (patch) | |
tree | 4377eb0dc5e221862489bdcc802e50e2f1f41cb1 /synapse/__init__.py | |
parent | Merge pull request #349 from stevenhammerton/sh-cas-auth-via-homeserver (diff) | |
parent | Slightly more aggressive retry timers at HTTP level (diff) | |
download | synapse-391f2aa56c54cee6001de415ae4609e15702629c.tar.xz |
Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse 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 |