Merge branch 'master'
authorjoshuaruesweg <ruesweg@woltlab.com>
Wed, 24 Jun 2020 17:26:05 +0000 (19:26 +0200)
committerjoshuaruesweg <ruesweg@woltlab.com>
Wed, 24 Jun 2020 17:26:05 +0000 (19:26 +0200)
commit73ab9ce154eb6afee90e1dcb26dd6d723cd0d3cf
tree34e71819c7450dafb3242b2981f7c25c3740833e
parent372cea3a820e13357ecd6dd2c80e301e4a074ba1
parentfb58607e30bd0d17904038e14700cfc8f180ef77
Merge branch 'master'
12 files changed:
com.woltlab.wcf/option.xml
com.woltlab.wcf/templates/user.tpl
wcfsetup/install/files/lib/acp/page/IndexPage.class.php
wcfsetup/install/files/lib/data/user/User.class.php
wcfsetup/install/files/lib/data/user/UserAction.class.php
wcfsetup/install/files/lib/data/user/UserProfile.class.php
wcfsetup/install/files/lib/data/user/UserProfileAction.class.php
wcfsetup/install/files/lib/form/RegisterForm.class.php
wcfsetup/install/files/lib/system/user/notification/UserNotificationHandler.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml
wcfsetup/setup/db/install.sql