projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e275643 2a37a3d)
Merge branch '2.0'
authorMatthias Schmidt <gravatronics@live.com>
Thu, 26 Jun 2014 21:24:52 +0000 (23:24 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Thu, 26 Jun 2014 21:24:52 +0000 (23:24 +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)