diff options
author | Erik Johnston <erik@matrix.org> | 2020-09-16 13:50:10 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2020-09-16 13:50:10 +0100 |
commit | 7c43643037a9800edfb67bf8258eb33b670c7a22 (patch) | |
tree | 9fdcbde20ade9942db0ab640340064151ba9d097 /synapse/config/emailconfig.py | |
parent | Merge branch 'erikj/fix_origin_check' into develop (diff) | |
parent | 1.19.2 (diff) | |
download | synapse-7c43643037a9800edfb67bf8258eb33b670c7a22.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/config/emailconfig.py')
0 files changed, 0 insertions, 0 deletions