Merge "Add string length limits"

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

Tue, 21 Nov 2017 15:21:26 +0000 (15:21 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 21 Nov 2017 15:21:26 +0000 (15:21 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 21 Nov 2017 15:21:26 +0000 (15:21 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 21 Nov 2017 15:21:26 +0000 (15:21 +0000)
diff --cc includes/api/ApiBase.php
Simple merge
diff --cc includes/api/ApiHelp.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 21 Nov 2017 15:21:26 +0000 (15:21 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 21 Nov 2017 15:21:26 +0000 (15:21 +0000)
		1	2
includes/api/ApiBase.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/api/ApiHelp.php	patch \|	diff1 \|	diff2 \|	blob \| history