Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Fri, 12 Oct 2018 17:10:54 +0000 (19:10 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 12 Oct 2018 17:10:54 +0000 (19:10 +0200)
commit02364c11437e8ef97e560206bfb24569239859eb
tree1ea1058a118064501dee61b1dd7d2647de692470
parent770fe5f83aa73a471b60e2f2ce5b849085307027
parentf9463f3a3352b9c4ec24ca3dae12472f37f99d44
Merge branch 'master' into next
com.woltlab.wcf/option.xml
wcfsetup/install/files/js/WoltLabSuite/Core/Media/Upload.js
wcfsetup/install/files/lib/system/WCF.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml