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)
commit80fcab5dd0971f027e2d5ee119bf2bb69ba2936b
tree10e7de85dd2ac05b3b7d79d9b47f48fd0b3f9ad3
parent8c50d5ccec9dc7f6940526ee085acfb873dcafde
parent6074eb5f7a213b39bd91a18a024c49fe3bddc9ba
Merge branch '5.2'
com.woltlab.wcf/option.xml
wcfsetup/install/files/lib/data/user/User.class.php