projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f4cddd4 49c2d3c)
Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorMarcel Werk <burntime@woltlab.com>
Tue, 20 Mar 2018 17:30:28 +0000 (18:30 +0100)
committerMarcel Werk <burntime@woltlab.com>
Tue, 20 Mar 2018 17:30:28 +0000 (18:30 +0100)
1  2 
wcfsetup/install/lang/de.xml patch | diff1 | diff2 | blob | history
wcfsetup/install/lang/en.xml patch | diff1 | diff2 | blob | history

diff --cc wcfsetup/install/lang/de.xml
Simple merge
diff --cc wcfsetup/install/lang/en.xml
Simple merge
WoltLab Suite Core (previously WoltLab Community Framework)