Merge "Revamp classic edit toolbar not to hardcode paths in HTML"

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

Tue, 16 Sep 2014 12:51:21 +0000 (12:51 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 16 Sep 2014 12:51:21 +0000 (12:51 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 16 Sep 2014 12:51:21 +0000 (12:51 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 16 Sep 2014 12:51:21 +0000 (12:51 +0000)
diff --cc includes/AutoLoader.php
Simple merge
diff --cc includes/EditPage.php
Simple merge
diff --cc languages/Language.php
Simple merge
diff --cc resources/Resources.php
Simple merge
diff --cc resources/src/mediawiki.legacy/shared.css
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 16 Sep 2014 12:51:21 +0000 (12:51 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 16 Sep 2014 12:51:21 +0000 (12:51 +0000)
		1	2
includes/AutoLoader.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/EditPage.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/Language.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/Resources.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/src/mediawiki.legacy/shared.css	patch \|	diff1 \|	diff2 \|	blob \| history