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

changelogs/client_server/newsfragments/1158.clarification

@@ -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.

changelogs/client_server/newsfragments/1284.feature

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

changelogs/client_server/newsfragments/1567.new

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

changelogs/client_server/newsfragments/1635.new

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