diff options
author | Erik Johnston <erik@matrix.org> | 2015-11-20 17:38:58 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-11-20 17:38:58 +0000 |
commit | 2ca01ed7470bd1fb0aa9cab0ad0546ea2911b682 (patch) | |
tree | d5d1c71f050d27e929daa72954704ad330cc9194 /synapse/server.py | |
parent | Merge branch 'hotfixes-v0.11.0-r2' of github.com:matrix-org/synapse (diff) | |
parent | Merge branch 'erikj/perspective_limiter' into release-v0.11.1 (diff) | |
download | synapse-2ca01ed7470bd1fb0aa9cab0ad0546ea2911b682.tar.xz |
Merge branch 'release-v0.11.1' of github.com:matrix-org/synapse v0.11.1
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions