projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 080db19 1f69f01)
Merge branch 'master' into cli
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 14 May 2013 11:50:32 +0000 (13:50 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 14 May 2013 11:50:32 +0000 (13:50 +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)