Merge "mw.ForeignStructuredUpload: Provide category suggestions from the right wiki"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Wed, 21 Oct 2015 17:55:19 +0000 (17:55 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 21 Oct 2015 17:55:19 +0000 (17:55 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 21 Oct 2015 17:55:19 +0000 (17:55 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 21 Oct 2015 17:55:19 +0000 (17:55 +0000)
diff --cc resources/Resources.php
Simple merge
diff --cc resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 21 Oct 2015 17:55:19 +0000 (17:55 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 21 Oct 2015 17:55:19 +0000 (17:55 +0000)
		1	2
resources/Resources.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js	patch \|	diff1 \|	diff2 \|	blob \| history