Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-20 16:38:37 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'rav/SPEC-254' into rav/flatten_sync

Browse source 
Conflicts:
	specification/events.rst
This commit is contained in:
Richard van der Hoff 2015-11-16 16:56:39 +00:00
parent 58b7901b51 0db055b4ea
commit 7ff593b3de
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
specification/events.rst
View file

@ -36,7 +36,8 @@ formatted for federation by:
that state key that state key
* Adding a ``redacted_because`` to event object if the event was * Adding a ``redacted_because`` to event object if the event was
redacted which gives the event that redacted it. redacted which gives the event that redacted it.
* Adding a ``txn_id`` if the event was sent by the client requesting it. * Adding a ``txn_id`` to the event object if the event was sent by the client
requesting it.
Events in responses for APIs with the /v1 prefix are generated from an event Events in responses for APIs with the /v1 prefix are generated from an event
formatted for the /v2 prefix by: formatted for the /v2 prefix by: