diff options
| author | Erik Johnston <erik@matrix.org> | 2020-10-30 16:27:02 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-10-30 16:27:02 +0000 |
| commit | f27a7896972d71af3ac21e82a81a64085fec32f1 (patch) | |
| tree | 3562d5ce93b4f21c927a5229165b2aabe1605698 /synapse | |
| parent | Merge branch 'release-v1.22.1' into develop (diff) | |
| parent | Fix changelog (diff) | |
| download | synapse-f27a7896972d71af3ac21e82a81a64085fec32f1.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 |