dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: efd2fcc 4a2ecaa)
Merge "Import.php: Use Config instead of globals"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 30 Oct 2014 22:42:00 +0000 (22:42 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 30 Oct 2014 22:42:00 +0000 (22:42 +0000)
1  2 
includes/api/ApiImport.php patch | diff1 | diff2 | blob | history
includes/specials/SpecialImport.php patch | diff1 | diff2 | blob | history

diff --cc includes/api/ApiImport.php
Simple merge
diff --cc includes/specials/SpecialImport.php
Simple merge
Wiklou, le Wiki du Wiklou