Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 15 May 2019 16:30:15 +0000 (18:30 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 15 May 2019 16:30:15 +0000 (18:30 +0200)
commit114dcb81a94c760243f5709dd154036928509d0a
tree6aa5851ea41e872bf996e45a69834474795213c8
parentfa97a69a23b75806d26ad57376d1a1e9a5ce5ea2
parent3ef36be20d9d2ea0e80fdb97b6f79cbe27ac60bf
Merge branch 'master' into next
com.woltlab.wcf/templates/cms.tpl
com.woltlab.wcf/templates/contact.tpl
com.woltlab.wcf/templates/moderationList.tpl
wcfsetup/install/files/lib/form/ContactForm.class.php
wcfsetup/install/files/lib/system/background/job/EmailDeliveryBackgroundJob.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml