Merge branch 'master' into event-redaction

This commit is contained in:
Cnly 2019-07-29 15:28:40 +08:00
commit bc4a3be298

View file

@ -154,3 +154,5 @@ 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