Merge "Implement OOUI display format for HTMLForm"

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

Sun, 24 May 2015 12:22:29 +0000 (12:22 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Sun, 24 May 2015 12:22:29 +0000 (12:22 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 24 May 2015 12:22:29 +0000 (12:22 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Sun, 24 May 2015 12:22:29 +0000 (12:22 +0000)
diff --cc autoload.php
Simple merge
diff --cc includes/htmlform/HTMLForm.php
Simple merge
diff --cc resources/Resources.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Sun, 24 May 2015 12:22:29 +0000 (12:22 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Sun, 24 May 2015 12:22:29 +0000 (12:22 +0000)
		1	2
autoload.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/htmlform/HTMLForm.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/Resources.php	patch \|	diff1 \|	diff2 \|	blob \| history