diff options
| author | Jeroen <vo.jeroen@gmail.com> | 2018-07-09 08:51:11 +0200 |
|---|---|---|
| committer | Jeroen <vo.jeroen@gmail.com> | 2018-07-09 08:51:11 +0200 |
| commit | b5e157d895dcf182d7ffc58edf6442deeaebc3f0 (patch) | |
| tree | a3f8a4549d0fe4947bef34632218b41c94202b19 /synapse/server.py | |
| parent | take idna implementation from twisted (diff) | |
| parent | Add an isort configuration (#3463) (diff) | |
| download | synapse-b5e157d895dcf182d7ffc58edf6442deeaebc3f0.tar.xz | |
Merge branch 'develop' into send_sni_for_federation_requests
# Conflicts: # synapse/http/endpoint.py
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions