projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
08b549e
a54b972
)
Merge branch '3.1' into 5.2
author
Tim Düsterhus
<duesterhus@woltlab.com>
Wed, 3 Jun 2020 10:19:54 +0000
(12:19 +0200)
committer
Tim Düsterhus
<duesterhus@woltlab.com>
Wed, 3 Jun 2020 10:19:54 +0000
(12:19 +0200)
1
2
wcfsetup/install/files/lib/data/user/User.class.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
wcfsetup/install/files/lib/data/user/User.class.php
Simple merge