Merge branch 'master' into parallel-worker
authorTim Düsterhus <duesterhus@woltlab.com>
Fri, 3 Jul 2020 14:07:10 +0000 (16:07 +0200)
committerGitHub <noreply@github.com>
Fri, 3 Jul 2020 14:07:10 +0000 (16:07 +0200)
commit4dbb14489adb365cae4317b811569d18cc51e484
treed971b96dcc3855e152219817b3821a627d324945
parenta9d66b28b54ae97735f70067e5d1dd8bc469d77e
parentf34502a0d8a362087f008ac58d460a75a82439bf
Merge branch 'master' into parallel-worker
wcfsetup/install/files/lib/system/CLIWCF.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml