Merge "Equalization translations for Serbian"

diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index 89c1f3a..9e86cb0 100644 (file)
--- a/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@ -146,7 +146,7 @@ production.
 * Updated composer/spdx-licenses from 1.3.0 to 1.4.0.
 * Updated jquery.i18n from 1.0.4 to 1.0.5.
 * Updated wikimedia/timestamp from 1.0.0 to 2.2.0.
-* Updated wikimedia/remex-html from 1.0.3 to 2.0.0.
+* Updated wikimedia/remex-html from 1.0.3 to 2.0.1.
 * Updated jquery from v3.2.1 to v3.3.1.
 
 ==== Removed external libraries ====

diff --git a/composer.json b/composer.json
index 2e13f90..d7a25e3 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -44,7 +44,7 @@
                "wikimedia/php-session-serializer": "1.0.6",
                "wikimedia/purtle": "1.0.7",
                "wikimedia/relpath": "2.1.1",
-               "wikimedia/remex-html": "2.0.0",
+               "wikimedia/remex-html": "2.0.1",
                "wikimedia/running-stat": "1.2.1",
                "wikimedia/scoped-callback": "2.0.0",
                "wikimedia/utfnormal": "2.0.0",

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 1e15524..fa95633 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2898,11 +2898,6 @@ $wgSquidPurgeUseHostHeader = true;
  * @endcode
  *
  * @since 1.22
- *
- * $wgHTCPRouting replaces $wgHTCPMulticastRouting that was introduced in 1.20.
- * For back compatibility purposes, whenever its array is empty
- * $wgHTCPMutlicastRouting will be used as a fallback if it not null.
- *
  * @see $wgHTCPMulticastTTL
  */
 $wgHTCPRouting = [];