projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92e4d5e 060fcbe)
Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Thu, 9 Mar 2017 18:03:14 +0000 (19:03 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Thu, 9 Mar 2017 18:03:14 +0000 (19:03 +0100)
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)