summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-03-15 09:59:54 +0000
committerGitHub <noreply@github.com>2017-03-15 09:59:54 +0000
commit7827251daf0af9dbb1156819c6673e0fe6047181 (patch)
tree756500fb5640933185b85bd71c5a04063f709e48 /tox.ini
parentMerge pull request #1992 from matrix-org/rav/fix_media_loop (diff)
parentUse extend instead of += (diff)
downloadsynapse-7827251daf0af9dbb1156819c6673e0fe6047181.tar.xz
Merge pull request #1994 from matrix-org/dbkr/msisdn_signin_2
Phone number registration / login support v2
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions