Merge pull request #389 from matrix-org/erikj/create_room_is_direct

Spec /createRoom is_direct flag, is_direct in member event and m.direct
This commit is contained in:
Richard van der Hoff 2016-10-06 17:19:48 +01:00 committed by GitHub
commit 909aef2b18
8 changed files with 107 additions and 1 deletions

View file

@ -1281,6 +1281,9 @@ have to wait in milliseconds before they can try again.
.. |/events| replace:: ``/events``
.. _/events: #get-matrix-client-%CLIENT_MAJOR_VERSION%-events
.. |/createRoom| replace:: ``/createRoom``
.. _/createRoom: #post-matrix-client-%CLIENT_MAJOR_VERSION%-createroom
.. |/rooms/<room_id>/initialSync| replace:: ``/rooms/<room_id>/initialSync``
.. _/rooms/<room_id>/initialSync: #get-matrix-client-%CLIENT_MAJOR_VERSION%-rooms-roomid-initialsync
@ -1316,3 +1319,6 @@ have to wait in milliseconds before they can try again.
.. |/account/3pid| replace:: ``/account/3pid``
.. _/account/3pid: #post-matrix-client-%CLIENT_MAJOR_VERSION%-account-3pid
.. |/user/<user_id>/account_data/<type>| replace:: ``/user/<user_id>/account_data/<type>``
.. _/user/<user_id>/account_data/<type>: #put-matrix-client-%CLIENT_MAJOR_VERSION%-user-userid-account-data-type