Merge "EditPage: Allow the 'save' button's label to be 'publish' for public wikis"

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

Wed, 24 Aug 2016 00:17:38 +0000 (00:17 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 24 Aug 2016 00:17:38 +0000 (00:17 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 24 Aug 2016 00:17:38 +0000 (00:17 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 24 Aug 2016 00:17:38 +0000 (00:17 +0000)
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc includes/EditPage.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 24 Aug 2016 00:17:38 +0000 (00:17 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 24 Aug 2016 00:17:38 +0000 (00:17 +0000)
		1	2
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/EditPage.php	patch \|	diff1 \|	diff2 \|	blob \| history