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

pull/977/head
Travis Ralston 6 years ago
commit 17a6a4c2ee

@ -1,3 +1 @@
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.
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.

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

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

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

Loading…
Cancel
Save