Merge "ApiOpenSearch: Don't output warnings in JSON mode"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 15 May 2015 20:23:00 +0000 (20:23 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 15 May 2015 20:23:00 +0000 (20:23 +0000)
1  2 
autoload.php
includes/api/i18n/en.json
includes/api/i18n/qqq.json

diff --cc autoload.php
Simple merge
Simple merge
Simple merge