Merge "add basic print styles to CologneBlue"

author TheDJ <hartman.wiki@gmail.com>

Tue, 14 May 2013 20:14:15 +0000 (20:14 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 14 May 2013 20:14:15 +0000 (20:14 +0000)
author TheDJ <hartman.wiki@gmail.com>
Tue, 14 May 2013 20:14:15 +0000 (20:14 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 14 May 2013 20:14:15 +0000 (20:14 +0000)
diff --cc resources/Resources.php
Simple merge
diff --cc skins/CologneBlue.php
Simple merge
author	TheDJ <hartman.wiki@gmail.com>
	Tue, 14 May 2013 20:14:15 +0000 (20:14 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 14 May 2013 20:14:15 +0000 (20:14 +0000)
		1	2
resources/Resources.php	patch \|	diff1 \|	diff2 \|	blob \| history
skins/CologneBlue.php	patch \|	diff1 \|	diff2 \|	blob \| history