Merge "resources: Remove the deprecated 'jquery.badge' module"

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

Wed, 1 Nov 2017 00:13:50 +0000 (00:13 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 1 Nov 2017 00:13:50 +0000 (00:13 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 1 Nov 2017 00:13:50 +0000 (00:13 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 1 Nov 2017 00:13:50 +0000 (00:13 +0000)
diff --cc RELEASE-NOTES-1.31
Simple merge
diff --cc resources/Resources.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 1 Nov 2017 00:13:50 +0000 (00:13 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 1 Nov 2017 00:13:50 +0000 (00:13 +0000)
		1	2
RELEASE-NOTES-1.31	patch \|	diff1 \|	diff2 \|	blob \| history
resources/Resources.php	patch \|	diff1 \|	diff2 \|	blob \| history