Merge "API: Handle "special" options in action=options"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 4 Feb 2014 18:43:40 +0000 (18:43 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 4 Feb 2014 18:43:40 +0000 (18:43 +0000)
commit11cb289cfc45fd40056bccae208934b11c98c10e
tree636866a5beb36e4e44b4223e91a49104e1a98592
parentda8e6bf5833671ba3dfa577c2fd7eff1638248f8
parentb393835bda6c6359dee4dfa5004d24319af262a3
Merge "API: Handle "special" options in action=options"
includes/Preferences.php
includes/User.php
includes/api/ApiOptions.php
tests/phpunit/includes/api/ApiOptionsTest.php