projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 125b4a1 4798d18)
Merge branch '2.0'
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 8 Sep 2014 16:28:50 +0000 (18:28 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 8 Sep 2014 16:28:50 +0000 (18:28 +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)