Merge branch 'master' into sync-full-state

This commit is contained in:
Alex Chen 2019-07-31 20:51:22 +08:00 committed by GitHub
commit dc1904f743
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -154,4 +154,8 @@ POST /login returns the same device_id as that in the request
POST /createRoom with creation content POST /createRoom with creation content
User can create and send/receive messages in a room with version 1 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 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
Full state sync includes joined rooms Full state sync includes joined rooms