projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f17453 e9aed8c)
Merge branch '3.0'
authorMarcel Werk <burntime@woltlab.com>
Wed, 1 Aug 2018 14:30:53 +0000 (16:30 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 1 Aug 2018 14:30:53 +0000 (16:30 +0200)
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)