Merge branch 'master' into fix-sync-edu-joined-rooms

This commit is contained in:
Cnly 2019-07-31 20:49:16 +08:00
commit 8fa14a76c5

View file

@ -154,3 +154,7 @@ POST /login returns the same device_id as that in the request
POST /createRoom with creation content
User can create and send/receive messages in a room with version 1
POST /createRoom ignores attempts to set the room version via creation_content
Inbound federation rejects remote attempts to join local users to rooms
Inbound federation rejects remote attempts to kick local users to rooms
An event which redacts itself should be ignored
A pair of events which redact each other should be ignored