summary refs log tree commit diff
path: root/tests/appservice
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-07-24 11:32:13 +0100
committerErik Johnston <erik@matrix.org>2018-07-24 11:32:13 +0100
commit97acd385a326302cb6791cf518db667bbf4f4d2a (patch)
tree385db0eb20a05b9d0f6b7ce181cc2e2253c24241 /tests/appservice
parentRemove unnecessary if (diff)
parentMerge pull request #3591 from matrix-org/rav/logcontext_fixes (diff)
downloadsynapse-97acd385a326302cb6791cf518db667bbf4f4d2a.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/speed_up_calculate_state_delta
Diffstat (limited to 'tests/appservice')
0 files changed, 0 insertions, 0 deletions