diff options
author | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2022-04-19 13:28:28 +0100 |
---|---|---|
committer | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2022-04-19 13:28:28 +0100 |
commit | 0921d93dcdd64101cc2433892f7a8cd1caf2b1f5 (patch) | |
tree | 1ea2b81caf42cce4a44fd06386af835fdaf38bb3 /synapse | |
parent | Back out implementation of MSC2314 (#12474) (diff) | |
parent | Link to specific version of upgrade notes (diff) | |
download | synapse-0921d93dcdd64101cc2433892f7a8cd1caf2b1f5.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 |