Merge "registration: Allow extensions to specify which MW core versions they require"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 22 Sep 2015 04:57:47 +0000 (04:57 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 22 Sep 2015 04:57:47 +0000 (04:57 +0000)
1  2 
autoload.php
composer.json
docs/extension.schema.json
includes/GlobalFunctions.php
includes/registration/ExtensionProcessor.php
includes/registration/ExtensionRegistry.php

diff --cc autoload.php
Simple merge
diff --cc composer.json
                "wiki": "https://www.mediawiki.org/"
        },
        "require": {
+               "composer/semver": "0.1.0",
                "cssjanus/cssjanus": "1.1.1",
                "ext-iconv": "*",
 -              "leafo/lessphp": "0.5.0",
                "liuggio/statsd-php-client": "1.0.16",
 -              "mediawiki/at-ease": "1.0.0",
 -              "oojs/oojs-ui": "0.12.6",
 +              "oyejorge/less.php": "1.7.0.5",
 +              "mediawiki/at-ease": "1.1.0",
 +              "oojs/oojs-ui": "0.12.8.1",
                "php": ">=5.3.3",
                "psr/log": "1.0.0",
                "wikimedia/assert": "0.2.2",
Simple merge
Simple merge