Various JobQueue test tweaks

[lhc/web/wiklou.git] / composer.json

diff --git a/composer.json b/composer.json
index 78c23ce..1cdf813 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,7 @@
                "wikimedia/base-convert": "1.0.1",
                "wikimedia/cdb": "1.3.0",
                "wikimedia/cldr-plural-rule-parser": "1.0.0",
-               "wikimedia/composer-merge-plugin": "1.2.1",
+               "wikimedia/composer-merge-plugin": "1.3.0",
                "wikimedia/ip-set": "1.0.1",
                "wikimedia/relpath": "1.0.3",
                "wikimedia/running-stat": "1.1.0",
@@ -82,7 +82,8 @@
                "merge-plugin": {
                        "include": [
                                "composer.local.json"
-                       ]
+                       ],
+                       "merge-dev": false
                }
        }
 }