Merge "prop=imageinfo&iiprop=url|thumbmime needs iiurlwidth="

author Catrope <roan.kattouw@gmail.com>

Wed, 18 Jul 2012 01:42:33 +0000 (01:42 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 18 Jul 2012 01:42:33 +0000 (01:42 +0000)
author Catrope <roan.kattouw@gmail.com>
Wed, 18 Jul 2012 01:42:33 +0000 (01:42 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 18 Jul 2012 01:42:33 +0000 (01:42 +0000)
diff --cc includes/api/ApiQueryAllImages.php
Simple merge
diff --cc includes/api/ApiQueryImageInfo.php
Simple merge
author	Catrope <roan.kattouw@gmail.com>
	Wed, 18 Jul 2012 01:42:33 +0000 (01:42 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 18 Jul 2012 01:42:33 +0000 (01:42 +0000)
		1	2
includes/api/ApiQueryAllImages.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/api/ApiQueryImageInfo.php	patch \|	diff1 \|	diff2 \|	blob \| history