summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-05-15 15:14:33 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-05-28 13:56:07 +0100
commit68f46e07f2bab943051f46c03912946ade2edea9 (patch)
tree3abfb476ccb1ccf67d86df1713c3fe62c3eac909 /synapse/api
parentAdd ProfileStore to synapse_port_db as it has a dinsic background update (diff)
downloadsynapse-68f46e07f2bab943051f46c03912946ade2edea9.tar.xz
Fix sytest CI
* Switch sytest-synapse to sytest-dinsic
* Be sure to invalidate our caches properly!
* Remove duplicate encryption state key definition
* Remove old config option name in comment
* Make dinsic the default in merge_base_branch
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/constants.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py
index 42eff8793b..cc8577552b 100644
--- a/synapse/api/constants.py
+++ b/synapse/api/constants.py
@@ -85,7 +85,6 @@ class EventTypes(object):
     RoomAvatar = "m.room.avatar"
     RoomEncryption = "m.room.encryption"
     GuestAccess = "m.room.guest_access"
-    Encryption = "m.room.encryption"
 
     # These are used for validation
     Message = "m.room.message"