dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7320a95 acc5df9)
Merge "Instruct stashed upload failures to reupload file"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 14 Sep 2017 19:46:49 +0000 (19:46 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 14 Sep 2017 19:46:49 +0000 (19:46 +0000)
1  2 
includes/specials/SpecialUpload.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/specials/SpecialUpload.php
Simple merge
diff --cc languages/i18n/en.json
Simple merge
diff --cc languages/i18n/qqq.json
Simple merge
Wiklou, le Wiki du Wiklou