Merge branch '2.1'
authorMatthias Schmidt <gravatronics@live.com>
Sun, 27 Nov 2016 14:34:52 +0000 (15:34 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 27 Nov 2016 14:34:52 +0000 (15:34 +0100)
commitaa6ed054359dec8fe1bc4594255a4812310dee24
treea6b394a98a5591aa32d3cf7b7e4165d22de2b921
parentd9f7a5a348e7776c6f659cb2f2c67caa2aa3cb96
parent927a12d2803e76f3cf3672660725cc48e3f2f50f
Merge branch '2.1'
wcfsetup/install/files/lib/system/option/FileOptionType.class.php
wcfsetup/install/files/lib/system/upload/UploadFile.class.php