diff options
author | Eric Eastwood <erice@element.io> | 2022-01-13 22:18:55 -0600 |
---|---|---|
committer | Eric Eastwood <erice@element.io> | 2022-01-13 22:18:55 -0600 |
commit | cc4eb72f2e3052d4e1a84f4a968da1c99280fe28 (patch) | |
tree | 3e388bfcb724b776b9dea07f99aa64fcd97a29fa /synapse/handlers/admin.py | |
parent | Fix NPE when trying to grab event from wrong roomId (fix sytest) (diff) | |
parent | Allow tracking puppeted users for MAU (#11561) (diff) | |
download | synapse-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