Merge "Suppress section edit links with action=render"

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

Wed, 26 Mar 2014 18:23:01 +0000 (18:23 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 26 Mar 2014 18:23:01 +0000 (18:23 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 26 Mar 2014 18:23:01 +0000 (18:23 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 26 Mar 2014 18:23:01 +0000 (18:23 +0000)
diff --cc RELEASE-NOTES-1.23
Simple merge
diff --cc includes/Article.php
Simple merge
diff --cc includes/OutputPage.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 26 Mar 2014 18:23:01 +0000 (18:23 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 26 Mar 2014 18:23:01 +0000 (18:23 +0000)
		1	2
RELEASE-NOTES-1.23	patch \|	diff1 \|	diff2 \|	blob \| history
includes/Article.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/OutputPage.php	patch \|	diff1 \|	diff2 \|	blob \| history