diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2021-04-22 11:23:56 +0100 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2021-04-22 11:23:56 +0100 |
commit | 31863242603da2125212fc010146017c0a8a4882 (patch) | |
tree | b7dad99ae7676a778fe04fd4a72fd3f116b1837e /synapse/config | |
parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
parent | Merge tag 'v1.32.2' (diff) | |
download | synapse-31863242603da2125212fc010146017c0a8a4882.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/config')
0 files changed, 0 insertions, 0 deletions