Merge "Add ability to pre-render thumbnails at upload time"

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

Thu, 25 Sep 2014 15:40:07 +0000 (15:40 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 25 Sep 2014 15:40:07 +0000 (15:40 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 25 Sep 2014 15:40:07 +0000 (15:40 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 25 Sep 2014 15:40:07 +0000 (15:40 +0000)
diff --cc includes/AutoLoader.php
Simple merge
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc includes/upload/UploadBase.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 25 Sep 2014 15:40:07 +0000 (15:40 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 25 Sep 2014 15:40:07 +0000 (15:40 +0000)
		1	2
includes/AutoLoader.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/upload/UploadBase.php	patch \|	diff1 \|	diff2 \|	blob \| history