diff options
author | Erik Johnston <erik@matrix.org> | 2017-03-13 09:59:54 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-03-13 09:59:54 +0000 |
commit | 672dcf59d3f9da12da43a77e316e2eec76d3ee4c (patch) | |
tree | 9186644b06ef01e609ca018e02100ceecf0f3ea4 /synapse/server.py | |
parent | Merge tag 'v0.19.3-rc1' into release-v0.19.3 (diff) | |
parent | Revert "Support registration & login with phone number" (diff) | |
download | synapse-672dcf59d3f9da12da43a77e316e2eec76d3ee4c.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.19.3
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions