diff options
author | Erik Johnston <erik@matrix.org> | 2017-10-27 15:07:08 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-10-27 15:07:08 +0100 |
commit | 4ab8abbc2b7376f1fad8b69f05f129a0438d8d20 (patch) | |
tree | 692f839a218353f3e1a0263c12ea08a5c7be0019 /synapse/config/emailconfig.py | |
parent | Merge pull request #2595 from matrix-org/erikj/attestation_commnet (diff) | |
parent | Import logger (diff) | |
download | synapse-4ab8abbc2b7376f1fad8b69f05f129a0438d8d20.tar.xz |
Merge branch 'erikj/attestation_local_fix' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/config/emailconfig.py')
0 files changed, 0 insertions, 0 deletions