projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d3bc7f6 70508f6)
Merge branch '5.5' into 6.0
authorMarcel Werk <burntime@woltlab.com>
Tue, 23 Apr 2024 10:55:53 +0000 (12:55 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 23 Apr 2024 10:55:53 +0000 (12:55 +0200)
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)