diff options
author | Erik Johnston <erik@matrix.org> | 2019-01-30 13:11:25 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-01-30 13:11:25 +0000 |
commit | ca46dcf683e43d2ae48c3b3e818e60d8eefe3e37 (patch) | |
tree | 8c1c32ab6145491dec27195b7d9a188325e5be0d /synapse/config/api.py | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff) | |
parent | Merge pull request #4524 from matrix-org/erikj/fix_no_tls (diff) | |
download | synapse-ca46dcf683e43d2ae48c3b3e818e60d8eefe3e37.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/config/api.py')
0 files changed, 0 insertions, 0 deletions