Merge pull request #1486 from turt2live/travis/words
Fix wording from bad merge
This commit is contained in:
commit
6dbbe1b838
1 changed files with 1 additions and 1 deletions
|
@ -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.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue