diff options
| author | hera <matrix@template.upcloud.com> | 2018-06-28 21:09:28 +0000 |
|---|---|---|
| committer | hera <matrix@template.upcloud.com> | 2018-06-28 21:09:28 +0000 |
| commit | 82781f5838c4fd152fe2698bc6a757ff3a200dbb (patch) | |
| tree | d4f779c1189f1367a2809d9f4aeb61e2f9998243 /synapse/http/client.py | |
| parent | Merge remote-tracking branch 'origin/revert-3451-hawkowl/sorteddict-api' into... (diff) | |
| parent | Merge pull request #3465 from matrix-org/matthew/as_ip_lock (diff) | |
| download | synapse-82781f5838c4fd152fe2698bc6a757ff3a200dbb.tar.xz | |
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/http/client.py')
| -rw-r--r-- | synapse/http/client.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py |