summary refs log tree commit diff
path: root/synapse/api/constants.py
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2021-01-04 02:58:27 +0000
committerGitHub <noreply@github.com>2021-01-04 02:58:27 +0000
commit2e0bc9804cdb453f4c5b7da403d288d04fdca1ba (patch)
tree26e259ef47c07e5d8657d5f381d92180b1e7328f /synapse/api/constants.py
parentAllow users to click account renewal links multiple times without hitting an ... (diff)
parentBetter align mainline and dinsic buildkite pipelines (diff)
downloadsynapse-2e0bc9804cdb453f4c5b7da403d288d04fdca1ba.tar.xz
Merge pull request #75 from matrix-org/anoa/dinsic_release_1_24_0
Updating DINUM's synapse branch from v1.21.2 -> v1.24.0.

Shouldn't be any deprecations or config file changes to worry about.

This merge is paired with one for Sytest as well: matrix-org/sytest#999
Diffstat (limited to 'synapse/api/constants.py')
-rw-r--r--synapse/api/constants.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py

index 46013cde15..592abd844b 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py
@@ -155,3 +155,8 @@ class EventContentFields: class RoomEncryptionAlgorithms: MEGOLM_V1_AES_SHA2 = "m.megolm.v1.aes-sha2" DEFAULT = MEGOLM_V1_AES_SHA2 + + +class AccountDataTypes: + DIRECT = "m.direct" + IGNORED_USER_LIST = "m.ignored_user_list"