Merge "mediawiki.api: Add unit tests for pipe-joining non-string values"

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index c92b522..ebd967e 100644 (file)
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -57,6 +57,8 @@ production.
 
 ==== Upgraded external libraries ====
 * Updated QUnit from v1.22.0 to v1.23.1.
+* Updated cssjanus from v1.1.2 to 1.1.3.
+* Updated psr/log from v1.0.0 to v1.0.2.
 
 ==== New external libraries ====
 

diff --git a/composer.json b/composer.json
index 1645495..71338a4 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
        },
        "require": {
                "composer/semver": "1.4.2",
-               "cssjanus/cssjanus": "1.1.2",
+               "cssjanus/cssjanus": "1.1.3",
                "ext-ctype": "*",
                "ext-iconv": "*",
                "ext-json": "*",
@@ -28,7 +28,7 @@
                "oojs/oojs-ui": "0.19.1",
                "oyejorge/less.php": "1.7.0.10",
                "php": ">=5.5.9",
-               "psr/log": "1.0.0",
+               "psr/log": "1.0.2",
                "wikimedia/assert": "0.2.2",
                "wikimedia/base-convert": "1.0.1",
                "wikimedia/cdb": "1.4.1",