summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-20 17:42:58 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-20 17:42:58 +0100
commit995136eb38340454d85c72a2c1295ffa3af01892 (patch)
tree57f8eb47677daf8bfb8d56dcfc95eb05ea0635f9 /synapse/server.py
parentMerge commit 'c9c1c9d82' into anoa/dinsic_release_1_31_0 (diff)
parentMerge remote-tracking branch 'origin/erikj/as_mau_block' into develop (diff)
downloadsynapse-995136eb38340454d85c72a2c1295ffa3af01892.tar.xz
Merge commit 'a7a913918' into anoa/dinsic_release_1_31_0
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions