Merge "Move Linker::formatTemplates() to separate class, remove global usage"

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

Thu, 15 Sep 2016 16:52:10 +0000 (16:52 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 15 Sep 2016 16:52:10 +0000 (16:52 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 15 Sep 2016 16:52:10 +0000 (16:52 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 15 Sep 2016 16:52:10 +0000 (16:52 +0000)
diff --cc autoload.php
Simple merge
diff --cc includes/EditPage.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 15 Sep 2016 16:52:10 +0000 (16:52 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 15 Sep 2016 16:52:10 +0000 (16:52 +0000)
		1	2
autoload.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/EditPage.php	patch \|	diff1 \|	diff2 \|	blob \| history