Merge pull request #1880 from owncloud/release-1.4.0

merge back release 1.4.0

changelog/1.4.0_2021-03-30/fix-jpeg-thumbnails.md

@@ -2,5 +2,5 @@ Bugfix: Fix thumbnail generation for jpegs
 
 Images with the extension `.jpeg` were not properly supported.
 
-https://github.com/owncloud/ocis/issues/1490
 https://github.com/owncloud/ocis/pull/1785
+https://github.com/owncloud/ocis/issues/1490

changelog/TEMPLATE

@@ -7,5 +7,5 @@ The text in the paragraphs is written in past tense. The last section is a list
 of issue URLs, PR URLs and other URLs. The first issue ID (or the first PR ID,
 in case there aren't any issue links) is used as the primary ID.
 
-https://github.com/owncloud/ocis/issues/1234
 https://github.com/owncloud/ocis/pull/55555
+https://github.com/owncloud/ocis/issues/1234