Merge branch 'master' into next
authorMarcel Werk <burntime@woltlab.com>
Wed, 2 Oct 2019 15:27:40 +0000 (17:27 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 2 Oct 2019 15:27:40 +0000 (17:27 +0200)
commit21131ffaed65b36462dbf36f3a83fdf541846fee
tree3fb0d59ef9a197bdde100f7e339e57568a05d7dd
parentd72ca1527464034551f13f9008d1425e8211ed96
parent6312b3db86f592a4d35d7267a759dad3368c699e
Merge branch 'master' into next
wcfsetup/install/files/lib/data/contact/option/ContactOptionAction.class.php
wcfsetup/install/files/lib/data/custom/option/CustomOption.class.php
wcfsetup/install/files/lib/system/moderation/queue/ModerationQueueActivationManager.class.php
wcfsetup/install/files/lib/system/moderation/queue/ModerationQueueReportManager.class.php
wcfsetup/install/files/lib/system/request/LinkHandler.class.php
wcfsetup/install/files/lib/system/template/plugin/LinkBlockTemplatePlugin.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml