diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2019-11-28 12:08:02 +0000 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-11-28 12:08:02 +0000 |
commit | 96562131a49d5a0b0e7e68f94f0884d23daaf8f3 (patch) | |
tree | 60704e66b8496e537ff833cd30002178673e4b00 /AUTHORS.rst | |
parent | Remove local threepids on account deactivation (#6426) (diff) | |
parent | 1.6.1 (diff) | |
download | synapse-96562131a49d5a0b0e7e68f94f0884d23daaf8f3.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'AUTHORS.rst')
0 files changed, 0 insertions, 0 deletions