Merge "Rename Skin::getUsableSkins() to Skin::getAllowedSkins()"

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

Sun, 13 Apr 2014 00:30:53 +0000 (00:30 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Sun, 13 Apr 2014 00:30:53 +0000 (00:30 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 13 Apr 2014 00:30:53 +0000 (00:30 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Sun, 13 Apr 2014 00:30:53 +0000 (00:30 +0000)
diff --cc includes/Preferences.php
Simple merge
diff --cc includes/Skin.php
Simple merge
diff --cc includes/api/ApiQuerySiteinfo.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Sun, 13 Apr 2014 00:30:53 +0000 (00:30 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Sun, 13 Apr 2014 00:30:53 +0000 (00:30 +0000)
		1	2
includes/Preferences.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/Skin.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/api/ApiQuerySiteinfo.php	patch \|	diff1 \|	diff2 \|	blob \| history