projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 805433f f968ffe)
Merge branch '3.0'
authorMarcel Werk <burntime@woltlab.com>
Tue, 23 Apr 2019 07:45:44 +0000 (09:45 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 23 Apr 2019 07:45:44 +0000 (09:45 +0200)
1  2 
com.woltlab.wcf/templates/login.tpl patch | diff1 | diff2 | blob | history
wcfsetup/install/lang/de.xml patch | diff1 | diff2 | blob | history

diff --cc com.woltlab.wcf/templates/login.tpl
Simple merge
diff --cc wcfsetup/install/lang/de.xml
Simple merge
WoltLab Suite Core (previously WoltLab Community Framework)