diff options
| author | Erik Johnston <erik@matrix.org> | 2017-04-11 11:13:32 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-04-11 11:13:32 +0100 |
| commit | f3cf3ff8b687e3ed699c1862f4fbc8be1f866f79 (patch) | |
| tree | 3abc25d85a4ad7b00bc632c4d7c6e695957ad305 /synapse/server.py | |
| parent | trust a hypothetical future riot.im IS (diff) | |
| parent | Merge branch 'release-v0.20.0' of github.com:matrix-org/synapse (diff) | |
| download | synapse-f3cf3ff8b687e3ed699c1862f4fbc8be1f866f79.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions