Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-03-17 17:04:10 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix wording from bad merge

Browse source
This commit is contained in:
Travis Ralston 2018-08-05 10:55:55 -06:00
parent 12692f62e7
commit dcb39f8890
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
specification/server_server_api.rst
View file

@ -629,7 +629,7 @@ if this optimisation fails.
Once the joining server has the room ID and the join candidates, it then needs Once the joining server has the room ID and the join candidates, it then needs
to obtain enough information about the room to fill in the required fields of to obtain enough information about the room to fill in the required fields of
the ``m.room.member`` event. It obtains this by selecting a resident from t the ``m.room.member`` event. It obtains this by selecting a resident from the
candidate list, and using the ``GET /make_join`` endpoint. The resident server candidate list, and using the ``GET /make_join`` endpoint. The resident server
will then reply with enough information for the joining server to fill in the will then reply with enough information for the joining server to fill in the
event. event.