summary refs log tree commit diff
path: root/tests/appservice/test_appservice.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-08-10 14:57:27 +0100
committerRichard van der Hoff <richard@matrix.org>2018-08-10 14:57:27 +0100
commitc31793a784059d3c90c1a81396fa832fa9efebac (patch)
tree63654adb84ea710c6de7d94216a137a536ec44c3 /tests/appservice/test_appservice.py
parentlog *after* reloading log config (diff)
parentchangelog (diff)
downloadsynapse-c31793a784059d3c90c1a81396fa832fa9efebac.tar.xz
Merge branch 'rav/fix_linearizer_cancellation' into develop
Diffstat (limited to 'tests/appservice/test_appservice.py')
0 files changed, 0 insertions, 0 deletions