Merge branch '3.0' into 3.1
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 3 Jun 2020 10:19:11 +0000 (12:19 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 3 Jun 2020 10:19:11 +0000 (12:19 +0200)
commita54b972c311ab52f22d89b62005589c155b93003
tree918f0768fac70c332b245ddf66947763733c2ba7
parent5824330738d9595ed4c99f74cec85465dd0b795e
parent2786011ddadc1aa1f1171227c6c0494187a44afe
Merge branch '3.0' into 3.1
wcfsetup/install/files/lib/data/user/User.class.php