summary refs log tree commit diff
path: root/synapse/handlers/admin.py
diff options
context:
space:
mode:
authorEric Eastwood <erice@element.io>2022-01-13 22:18:55 -0600
committerEric Eastwood <erice@element.io>2022-01-13 22:18:55 -0600
commitcc4eb72f2e3052d4e1a84f4a968da1c99280fe28 (patch)
tree3e388bfcb724b776b9dea07f99aa64fcd97a29fa /synapse/handlers/admin.py
parentFix NPE when trying to grab event from wrong roomId (fix sytest) (diff)
parentAllow tracking puppeted users for MAU (#11561) (diff)
downloadsynapse-cc4eb72f2e3052d4e1a84f4a968da1c99280fe28.tar.xz
Merge branch 'develop' into madlittlemods/return-historical-events-in-order-from-backfill
Conflicts:
	scripts-dev/complement.sh
Diffstat (limited to 'synapse/handlers/admin.py')
0 files changed, 0 insertions, 0 deletions