Merge "Revert "Setting up a way to have uploading by URL, but not on Special:Upload""

author Kaldari <rkaldari@wikimedia.org>

Fri, 31 Aug 2012 00:06:33 +0000 (00:06 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 31 Aug 2012 00:06:33 +0000 (00:06 +0000)
author Kaldari <rkaldari@wikimedia.org>
Fri, 31 Aug 2012 00:06:33 +0000 (00:06 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 31 Aug 2012 00:06:33 +0000 (00:06 +0000)
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc includes/specials/SpecialUpload.php
Simple merge
author	Kaldari <rkaldari@wikimedia.org>
	Fri, 31 Aug 2012 00:06:33 +0000 (00:06 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 31 Aug 2012 00:06:33 +0000 (00:06 +0000)
		1	2
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/specials/SpecialUpload.php	patch \|	diff1 \|	diff2 \|	blob \| history