Merge "Add hook to allow lazy loading of import sources"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 23 Sep 2015 16:30:36 +0000 (16:30 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 23 Sep 2015 16:30:36 +0000 (16:30 +0000)
1  2 
docs/hooks.txt
includes/DefaultSettings.php
includes/api/ApiImport.php
includes/specials/SpecialImport.php

diff --cc docs/hooks.txt
Simple merge
Simple merge
Simple merge
Simple merge