diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2021-06-29 10:20:38 +0100 |
---|---|---|
committer | Brendan Abolivier <babolivier@matrix.org> | 2021-06-29 10:20:38 +0100 |
commit | 3d370efc6d79327079138808ef5ecb8cf9f24d9f (patch) | |
tree | 77361174d9f9a358b015fffaa5a963116615884c /synapse | |
parent | Add additional types to the federation transport server. (#10213) (diff) | |
parent | Move deprecation notices to the top of the changelog (diff) | |
download | synapse-3d370efc6d79327079138808ef5ecb8cf9f24d9f.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
-rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py |