Merge "DatabaseBase constructor cleanups"

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

diff --git a/composer.json b/composer.json
index 75aed40..1650394 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
                "php": ">=5.3.3",
                "psr/log": "1.0.0",
                "wikimedia/cdb": "1.0.1",
-               "wikimedia/composer-merge-plugin": "0.5.0",
+               "wikimedia/composer-merge-plugin": "1.0.0",
                "zordius/lightncandy": "0.18"
        },
        "require-dev": {