diff options
author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2021-04-28 10:07:20 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-28 10:07:20 +0100 |
commit | a5575ea3cf5a16ae2cf57e812e27cd657f1d220f (patch) | |
tree | 8c2ae84631994082ddf3ae28af475a65e0bc68bd /synapse/logging/utils.py | |
parent | Port "Allow providing credentials to HTTPS_PROXY (#9657)" from mainline (#95) (diff) | |
parent | Remove 3.6 old deps check (diff) | |
download | synapse-a5575ea3cf5a16ae2cf57e812e27cd657f1d220f.tar.xz |
Merge pull request #97 from matrix-org/anoa/dinsic_release_1_31_0
Merge Synapse release v1.31.0 into dinsic
Diffstat (limited to 'synapse/logging/utils.py')
-rw-r--r-- | synapse/logging/utils.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/logging/utils.py b/synapse/logging/utils.py |