Merge branch '3.1' into 5.2
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 3 Jun 2020 10:19:54 +0000 (12:19 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 3 Jun 2020 10:19:54 +0000 (12:19 +0200)
commit6074eb5f7a213b39bd91a18a024c49fe3bddc9ba
treea65d99f16508c35fbd270fdd3cb7622130c8e74b
parent08b549e70850ab2fcad01cb877168e28ac79a3e4
parenta54b972c311ab52f22d89b62005589c155b93003
Merge branch '3.1' into 5.2
wcfsetup/install/files/lib/data/user/User.class.php