summary refs log tree commit diff
path: root/synapse/state
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-12-13 10:55:47 +0000
committerErik Johnston <erik@matrix.org>2019-12-13 10:55:47 +0000
commitf46e05d0537e79e2811522fad5021a20f41fd733 (patch)
tree8e64bd77b9771d32c594470cbab9225b74701f09 /synapse/state
parentAdjust the sytest blacklist for worker mode (#6538) (diff)
parentMerge tag 'v1.7.0' (diff)
downloadsynapse-f46e05d0537e79e2811522fad5021a20f41fd733.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/state')
0 files changed, 0 insertions, 0 deletions