diff options
author | Eric Eastwood <erice@element.io> | 2022-09-20 18:04:30 -0500 |
---|---|---|
committer | Eric Eastwood <erice@element.io> | 2022-09-20 18:04:30 -0500 |
commit | 05e511368bb65f08e700bba141a702595436e14d (patch) | |
tree | 98f408d69c51288e81bf3ba16c69c960e5e27794 /synapse/handlers/admin.py | |
parent | Remove debug logs (diff) | |
parent | Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry (diff) | |
download | synapse-05e511368bb65f08e700bba141a702595436e14d.tar.xz |
Merge branch 'madlittlemods/11850-migrate-to-opentelemetry' into madlittlemods/13356-messages-investigation-scratch-v1
Conflicts: poetry.lock synapse/handlers/federation.py
Diffstat (limited to 'synapse/handlers/admin.py')
-rw-r--r-- | synapse/handlers/admin.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/handlers/admin.py b/synapse/handlers/admin.py index d4fe7df533..cf9f19608a 100644 --- a/synapse/handlers/admin.py +++ b/synapse/handlers/admin.py @@ -70,6 +70,7 @@ class AdminHandler: "appservice_id", "consent_server_notice_sent", "consent_version", + "consent_ts", "user_type", "is_guest", } |