projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2df1b9b a8ad4fe)
Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Wed, 27 Aug 2014 00:18:40 +0000 (02:18 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 27 Aug 2014 00:18:40 +0000 (02:18 +0200)
1  2 
wcfsetup/install/lang/en.xml patch | diff1 | diff2 | blob | history

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