summary refs log tree commit diff
path: root/LICENSE
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-07-29 16:29:17 +0100
committerErik Johnston <erik@matrix.org>2021-07-29 16:29:17 +0100
commit65f520697da2df74afac24c4beb08eddba8342b3 (patch)
tree34c0df9e866f85271fc33ce4710c83f76d6b2f73 /LICENSE
parentImprove failover logic for MSC3083 restricted rooms. (#10447) (diff)
parentMerge tag 'v1.39.0' (diff)
downloadsynapse-65f520697da2df74afac24c4beb08eddba8342b3.tar.xz
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions