Merge branch 'travis/c2s/fix-changelog' into client_server/release-r0.4.0

This commit is contained in:
Travis Ralston 2018-08-31 16:45:09 -06:00
commit 17a6a4c2ee
5 changed files with 8 additions and 10 deletions

View file

@ -1,3 +1 @@
Update ``ImageInfo`` and ``ThumbnailInfo`` dimension schema descriptions Update ``ImageInfo`` and ``ThumbnailInfo`` dimension schema descriptions to clarify that they relate to intended display size, as opposed to the intrinsic size of the image file.
to clarify that they relate to intended display size, as opposed to the
intrinsic size of the image file.

View file

@ -1,7 +1,7 @@
End-to-end encryption for group chats: End-to-end encryption for group chats:
- Olm and Megolm messaging algorithms. * Olm and Megolm messaging algorithms.
- ``m.room.encrypted``, ``m.room.encryption``, ``m.room_key`` events. * ``m.room.encrypted``, ``m.room.encryption``, ``m.room_key`` events.
- Device verification process. * Device verification process.
- ``device_one_time_keys_count`` sync parameter. * ``device_one_time_keys_count`` sync parameter.
- ``device_lists:left`` sync parameter. * ``device_lists:left`` sync parameter.

View file

@ -1 +1 @@
Add ``POST /account/3pid/delete`` ``POST /account/3pid/delete``

View file

@ -1 +1 @@
POST ``/rooms/{roomId}/read_markers`` ``POST /rooms/{roomId}/read_markers``