Merge branch 'master' into media-consent
authorAlexander Ebert <ebert@woltlab.com>
Fri, 12 Jun 2020 18:17:17 +0000 (20:17 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 12 Jun 2020 18:17:17 +0000 (20:17 +0200)
commitdcb9180bff26481c958864221062f0271b1cb25a
treead6e0545b28e6d7b4a8848afc5ef9b2bfa907f7b
parent3ffe6e3f171f31950bfd03adb284005413ac5ff9
parent765c4d72c04f3919a5ec04437a582d2a5fffbab9
Merge branch 'master' into media-consent
com.woltlab.wcf/option.xml
com.woltlab.wcf/userOption.xml
constants.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml