projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 60eef1d 34c405e)
Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sat, 29 Dec 2012 02:16:55 +0000 (03:16 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sat, 29 Dec 2012 02:16:55 +0000 (03:16 +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)