diff options
author | Erik Johnston <erik@matrix.org> | 2019-06-28 10:04:54 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-06-28 10:04:54 +0100 |
commit | 576b62a6a314ea3928f8717704bbd3aedbdd1f25 (patch) | |
tree | a9252a394dae4fc3839585a2abfeeee65593560a /synapse/config/api.py | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff) | |
parent | Update the TLS cipher string and provide configurability for TLS on outgoing ... (diff) | |
download | synapse-576b62a6a314ea3928f8717704bbd3aedbdd1f25.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/config/api.py')
-rw-r--r-- | synapse/config/api.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/api.py b/synapse/config/api.py |