Merge "API: i18n for warnings and errors"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 6 Dec 2016 19:57:45 +0000 (19:57 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 6 Dec 2016 19:57:45 +0000 (19:57 +0000)
1  2 
RELEASE-NOTES-1.29
autoload.php
docs/hooks.txt
includes/specials/SpecialEmailuser.php
includes/specials/SpecialUnblock.php
languages/i18n/en.json
languages/i18n/qqq.json

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