diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-06-05 17:42:49 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-06-05 17:42:49 +0100 |
commit | 522bd3c8a373e28f6906a2099945038e42f8e2ba (patch) | |
tree | fc17bd3ac1fe07c68842c97cca05d32681b53d50 /synapse/config/appservice.py | |
parent | Port to sortedcontainers (with tests!) (#3332) (diff) | |
parent | Merge pull request #3290 from rubo77/patch-7 (diff) | |
download | synapse-522bd3c8a373e28f6906a2099945038e42f8e2ba.tar.xz |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'synapse/config/appservice.py')
0 files changed, 0 insertions, 0 deletions