Merge "mediawiki.action.edit: Add styles for edit form's footer"

author TheDJ <hartman.wiki@gmail.com>

Thu, 15 Aug 2013 18:31:26 +0000 (18:31 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 15 Aug 2013 18:31:26 +0000 (18:31 +0000)
author TheDJ <hartman.wiki@gmail.com>
Thu, 15 Aug 2013 18:31:26 +0000 (18:31 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 15 Aug 2013 18:31:26 +0000 (18:31 +0000)
diff --cc includes/EditPage.php
Simple merge
diff --cc resources/Resources.php
Simple merge
author	TheDJ <hartman.wiki@gmail.com>
	Thu, 15 Aug 2013 18:31:26 +0000 (18:31 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 15 Aug 2013 18:31:26 +0000 (18:31 +0000)
		1	2
includes/EditPage.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/Resources.php	patch \|	diff1 \|	diff2 \|	blob \| history