Merge branch '2.1'

author Matthias Schmidt <gravatronics@live.com>

Sun, 27 Nov 2016 14:34:52 +0000 (15:34 +0100)

committer Matthias Schmidt <gravatronics@live.com>

Sun, 27 Nov 2016 14:34:52 +0000 (15:34 +0100)
author Matthias Schmidt <gravatronics@live.com>
Sun, 27 Nov 2016 14:34:52 +0000 (15:34 +0100)
committer Matthias Schmidt <gravatronics@live.com>
Sun, 27 Nov 2016 14:34:52 +0000 (15:34 +0100)
diff --cc wcfsetup/install/files/lib/system/option/FileOptionType.class.php
Simple merge
diff --cc wcfsetup/install/files/lib/system/upload/UploadFile.class.php
Simple merge
author	Matthias Schmidt <gravatronics@live.com>
	Sun, 27 Nov 2016 14:34:52 +0000 (15:34 +0100)
committer	Matthias Schmidt <gravatronics@live.com>
	Sun, 27 Nov 2016 14:34:52 +0000 (15:34 +0100)
		1	2
wcfsetup/install/files/lib/system/option/FileOptionType.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/upload/UploadFile.class.php	patch \|	diff1 \|	diff2 \|	blob \| history