dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9e07745 ed96799)
Merge "Add two more categories to Special:TrackingCategories"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 12 May 2014 14:18:33 +0000 (14:18 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 12 May 2014 14:18:33 +0000 (14:18 +0000)
1  2 
includes/DefaultSettings.php patch | diff1 | diff2 | blob | history
languages/i18n/en.json patch | diff1 | diff2 | blob | history
languages/i18n/qqq.json patch | diff1 | diff2 | blob | history

diff --cc includes/DefaultSettings.php
Simple merge
diff --cc languages/i18n/en.json
Simple merge
diff --cc languages/i18n/qqq.json
Simple merge
Wiklou, le Wiki du Wiklou