From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 16 Apr 2015 01:05:51 +0000 (+0000)
Subject: Merge "API: Overhaul ApiResult, make format=xml not throw, and add json formatversion"
X-Git-Tag: 1.31.0-rc.0~11697
X-Git-Url: http://git.cyclocoop.org/data/%24oldEdit?a=commitdiff_plain;h=4fa02402289e9ba08369f2c3f9cb78eb0080027a;p=lhc%2Fweb%2Fwiklou.git

Merge "API: Overhaul ApiResult, make format=xml not throw, and add json formatversion"
---

4fa02402289e9ba08369f2c3f9cb78eb0080027a
diff --cc autoload.php
index 92d60145d8,367793a6f4..93f8e43028
--- a/autoload.php
+++ b/autoload.php
@@@ -122,9 -127,9 +127,10 @@@ $wgAutoloadLocalClasses = array
  	'ApiRevisionDelete' => __DIR__ . '/includes/api/ApiRevisionDelete.php',
  	'ApiRollback' => __DIR__ . '/includes/api/ApiRollback.php',
  	'ApiRsd' => __DIR__ . '/includes/api/ApiRsd.php',
+ 	'ApiSerializable' => __DIR__ . '/includes/api/ApiSerializable.php',
  	'ApiSetNotificationTimestamp' => __DIR__ . '/includes/api/ApiSetNotificationTimestamp.php',
  	'ApiStashEdit' => __DIR__ . '/includes/api/ApiStashEdit.php',
 +	'ApiTag' => __DIR__ . '/includes/api/ApiTag.php',
  	'ApiTokens' => __DIR__ . '/includes/api/ApiTokens.php',
  	'ApiUnblock' => __DIR__ . '/includes/api/ApiUnblock.php',
  	'ApiUndelete' => __DIR__ . '/includes/api/ApiUndelete.php',