diff options
| author | Erik Johnston <erik@matrix.org> | 2020-10-27 12:12:54 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-10-27 12:12:54 +0000 |
| commit | 24229fac0511e8815752fa05f7533360ffe80ecf (patch) | |
| tree | 30f6f38fda83acadfe78dc6915db8c8eebab391b /synapse | |
| parent | e2e: ensure we have both master and self-signing key (#8455) (diff) | |
| parent | 1.22.0 (diff) | |
| download | synapse-24229fac0511e8815752fa05f7533360ffe80ecf.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 |