diff options
author | Erik Johnston <erik@matrix.org> | 2021-02-25 10:53:31 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2021-02-25 10:53:31 +0000 |
commit | 1efdcc3e8724808996a7b60a60ca72c1b96fee0b (patch) | |
tree | 0c4d80707391fc3e6a68abd7b3646f79fa5d2cb8 /synapse/__init__.py | |
parent | Add support for X-Forwarded-Proto (#9472) (diff) | |
parent | Fixup changelog (diff) | |
download | synapse-1efdcc3e8724808996a7b60a60ca72c1b96fee0b.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/__init__.py')
-rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py |