Don't alias tt special pages to titles with double underscore

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

diff --git a/composer.json b/composer.json
index 75aed40..7f8c661 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -17,12 +17,13 @@
        },
        "require": {
                "cssjanus/cssjanus": "1.1.1",
+               "ext-iconv": "*",
                "leafo/lessphp": "0.5.0",
                "oojs/oojs-ui": "0.8.0",
                "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": {
@@ -31,6 +32,7 @@
        },
        "suggest": {
                "ext-fileinfo": "*",
+               "ext-intl": "*",
                "ext-mbstring": "*",
                "ext-wikidiff2": "*",
                "ext-apc": "*",