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

author Catrope <roan.kattouw@gmail.com>

Wed, 29 Aug 2012 19:25:13 +0000 (19:25 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 29 Aug 2012 19:25:13 +0000 (19:25 +0000)
author Catrope <roan.kattouw@gmail.com>
Wed, 29 Aug 2012 19:25:13 +0000 (19:25 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 29 Aug 2012 19:25:13 +0000 (19:25 +0000)
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc includes/specials/SpecialUpload.php
Simple merge
author	Catrope <roan.kattouw@gmail.com>
	Wed, 29 Aug 2012 19:25:13 +0000 (19:25 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 29 Aug 2012 19:25:13 +0000 (19:25 +0000)
		1	2
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/specials/SpecialUpload.php	patch \|	diff1 \|	diff2 \|	blob \| history