Merge "ApiUpload: Better handle ApiMessage errors from UploadVerifyFile hook"

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

Mon, 11 Jul 2016 19:34:49 +0000 (19:34 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Mon, 11 Jul 2016 19:34:49 +0000 (19:34 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 11 Jul 2016 19:34:49 +0000 (19:34 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Mon, 11 Jul 2016 19:34:49 +0000 (19:34 +0000)
diff --cc docs/hooks.txt
Simple merge
diff --cc includes/api/ApiUpload.php
Simple merge
diff --cc includes/upload/UploadBase.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Mon, 11 Jul 2016 19:34:49 +0000 (19:34 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Mon, 11 Jul 2016 19:34:49 +0000 (19:34 +0000)
		1	2
docs/hooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history
includes/api/ApiUpload.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/upload/UploadBase.php	patch \|	diff1 \|	diff2 \|	blob \| history