diff options
| author | Erik Johnston <erik@matrix.org> | 2021-03-22 13:36:36 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2021-03-22 13:36:36 +0000 |
| commit | d600d4506b1381e3db1e8f36abafd4038cedf905 (patch) | |
| tree | 2d120cde0d29788f672daf13dca9eb1f6a80f36c /synapse | |
| parent | Merge pull request #9644 from matrix-org/babolivier/msc3026 (diff) | |
| parent | 1.30.0 (diff) | |
| download | synapse-d600d4506b1381e3db1e8f36abafd4038cedf905.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 |