projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 687b606 65575f2)
Merge branch 'master' into next
authorAlexander Ebert <ebert@woltlab.com>
Thu, 16 Jan 2020 17:32:14 +0000 (18:32 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 16 Jan 2020 17:32:14 +0000 (18:32 +0100)
1  2 
com.woltlab.wcf/templates/user.tpl patch | diff1 | diff2 | blob | history

diff --cc com.woltlab.wcf/templates/user.tpl
Simple merge
WoltLab Suite Core (previously WoltLab Community Framework)