diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2021-04-13 16:10:07 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2021-04-13 16:10:07 +0100 |
| commit | 77866a5f5f9e805ebe599a5dc7d19152b68a0f01 (patch) | |
| tree | e81016df9807f97c1c8f88b82ad9c73cbaa94586 /synapse/handlers/admin.py | |
| parent | Revert "Patch to temporarily drop cross-user m.key_share_requests (#8675)" (diff) | |
| parent | Merge branch 'erikj/fix_stalled_catchup' into matrix-org-hotfixes (diff) | |
| download | synapse-77866a5f5f9e805ebe599a5dc7d19152b68a0f01.tar.xz | |
Merge branch 'matrix-org-hotfixes' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/admin.py')
| -rw-r--r-- | synapse/handlers/admin.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/admin.py b/synapse/handlers/admin.py |