diff options
author | Erik Johnston <erik@matrix.org> | 2015-10-26 18:16:31 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-10-26 18:16:31 +0000 |
commit | a299fede9d7a25361a2f118a6530c46527b96d8d (patch) | |
tree | eaf53c0c919aefcc46c03555ae7da83d8ee9a371 /tox.ini | |
parent | Use correct service url (diff) | |
parent | Merge pull request #330 from matrix-org/erikj/login_fallback (diff) | |
download | synapse-a299fede9d7a25361a2f118a6530c46527b96d8d.tar.xz |
Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into release-v0.10.1
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions