diff options
author | David Baker <dave@matrix.org> | 2015-08-20 10:16:01 +0100 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2015-08-20 10:16:01 +0100 |
commit | c50ad14bae20d2a8448bb9fe78e919958dc9d233 (patch) | |
tree | 3b6b3221cb11b16a105d1edf9e4ffe9519c3900a /synapse/federation/persistence.py | |
parent | Allow sign in using email address (diff) | |
parent | Merge pull request #211 from matrix-org/email_in_use (diff) | |
download | synapse-c50ad14bae20d2a8448bb9fe78e919958dc9d233.tar.xz |
Merge branch 'develop' into email_login
Diffstat (limited to 'synapse/federation/persistence.py')
0 files changed, 0 insertions, 0 deletions