Merge "Reduced some instances of HTTP 500 in thumb.php"

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

diff --git a/composer.json b/composer.json
index 2691ed8..852f2d2 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -21,12 +21,13 @@
                "leafo/lessphp": "0.5.0",
                "liuggio/statsd-php-client": "1.0.16",
                "mediawiki/at-ease": "1.0.0",
-               "oojs/oojs-ui": "0.12.4",
+               "oojs/oojs-ui": "0.12.6",
                "php": ">=5.3.3",
                "psr/log": "1.0.0",
-               "wikimedia/cdb": "1.0.1",
                "wikimedia/assert": "0.2.2",
+               "wikimedia/cdb": "1.0.1",
                "wikimedia/composer-merge-plugin": "1.2.1",
+               "wikimedia/ip-set": "1.0.1",
                "wikimedia/utfnormal": "1.0.2",
                "wikimedia/wrappedstring": "2.0.0",
                "zordius/lightncandy": "0.21"
@@ -45,7 +46,8 @@
                "ext-apc": "Local data and opcode cache",
                "monolog/monolog": "Flexible debug logging system",
                "pear/mail": "Mail sending support",
-               "pear/mail_mime": "Mail sending support"
+               "pear/mail_mime": "Mail sending support",
+               "pear/mail_mime-decode": "Mail sending support"
        },
        "autoload": {
                "psr-0": {