diff options
author | Sean Quah <8349537+squahtx@users.noreply.github.com> | 2021-12-08 10:47:09 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-08 10:47:09 +0000 |
commit | 2e2f5c043e08da517d2673f87ba22597d5599268 (patch) | |
tree | 74df92690df6785819125886a2be6d42b4bb1098 /synapse/app | |
parent | Merge branch 'develop' into squah/leave_space_admin_api (diff) | |
parent | Send and handle cross-signing messages using the stable prefix. (#10520) (diff) | |
download | synapse-github/squah/leave_space_admin_api.tar.xz |
Merge branch 'develop' into squah/leave_space_admin_api github/squah/leave_space_admin_api squah/leave_space_admin_api
Diffstat (limited to 'synapse/app')
-rw-r--r-- | synapse/app/_base.py | 3 | ||||
-rw-r--r-- | synapse/app/generic_worker.py | 6 | ||||
-rw-r--r-- | synapse/app/homeserver.py | 7 |
3 files changed, 14 insertions, 2 deletions
diff --git a/synapse/app/_base.py b/synapse/app/_base.py |