summary refs log tree commit diff
path: root/synapse/state
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-22 11:23:56 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-22 11:23:56 +0100
commit31863242603da2125212fc010146017c0a8a4882 (patch)
treeb7dad99ae7676a778fe04fd4a72fd3f116b1837e /synapse/state
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentMerge tag 'v1.32.2' (diff)
downloadsynapse-31863242603da2125212fc010146017c0a8a4882.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/state')
0 files changed, 0 insertions, 0 deletions