dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa40ce4 b93e106)
Merge "Add editing own JSON to editmyoptions grant"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 20 Dec 2018 07:35:09 +0000 (07:35 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 20 Dec 2018 07:35:09 +0000 (07:35 +0000)
1  2 
includes/DefaultSettings.php patch | diff1 | diff2 | blob | history
languages/i18n/en.json patch | diff1 | diff2 | blob | history

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