Merge branch 'master' into next
authorAlexander Ebert <ebert@woltlab.com>
Sun, 3 Nov 2019 15:58:26 +0000 (16:58 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 3 Nov 2019 15:58:26 +0000 (16:58 +0100)
commit20a941b2e60a3fa60b8520789f3264848b1aa933
treee0756a197ed959d8502029576624b39a61af1634
parent8068e4595b0e38fa8521176d3a7c373f28d8b749
parent851c1bf938bc19d58be4ca3e0e9aac6ed7e295e9
Merge branch 'master' into next
wcfsetup/install/files/acp/templates/userAdd.tpl
wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabClean.js
wcfsetup/install/files/lib/system/menu/user/profile/content/LikesUserProfileMenuContent.class.php