diff options
author | Mark Haines <mark.haines@matrix.org> | 2016-12-30 15:13:49 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2016-12-30 15:13:49 +0000 |
commit | f576c34594e5bc6eaa83b32864a02f42aeaf0761 (patch) | |
tree | 27e9aff6be00ceffd365e9854ea82b117589b97b /synapse/config/server.py | |
parent | Merge branch 'release-v0.18.6' into develop (diff) | |
parent | Merge pull request #1731 from matrix-org/markjh/logging-memleak (diff) | |
download | synapse-f576c34594e5bc6eaa83b32864a02f42aeaf0761.tar.xz |
Merge remote-tracking branch 'origin/release-v0.18.6' into develop
Diffstat (limited to 'synapse/config/server.py')
0 files changed, 0 insertions, 0 deletions