Merge branch '5.2'
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 3 Jun 2020 10:20:20 +0000 (12:20 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 3 Jun 2020 10:20:20 +0000 (12:20 +0200)
1  2 
com.woltlab.wcf/option.xml
wcfsetup/install/files/lib/data/user/User.class.php

Simple merge