Merge "Bump wikimedia/composer-merge-plugin to 1.2.0"

diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26
index 33ba6de..dc36d00 100644 (file)
--- a/RELEASE-NOTES-1.26
+++ b/RELEASE-NOTES-1.26
@@ -30,7 +30,7 @@ production.
 * (T68699) The expiration of the UserID and Token login cookies
   ($wgExtendedLoginCookieExpiration) can be configured independently of the
   expiration of all other cookies ($wgCookieExpiration).
-* (bug 50519) Support for generating JPEG/PNG thumbnails from WebP images added
+* (T50519) Support for generating JPEG/PNG thumbnails from WebP images added
   if ImageMagick is used as image scaler ($wgUseImageMagick = true). Uploading
   of WebP images still disabled by default. Add $wgFileExtensions[] =
   'webp'; to LocalSettings.php to enable uploading of WebP images.
@@ -45,7 +45,7 @@ production.
 * Added mediawiki/at-ease 1.0.0
 
 === Bug fixes in 1.26 ===
-* (bug 51283) load.php sometimes sends 304 response without full headers
+* (T53283) load.php sometimes sends 304 response without full headers
 * (T65198) Talk page tabs now have a "rel=discussion" attribute
 
 === Action API changes in 1.26 ===