projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e00d344 78db3fb)
Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Mon, 30 Sep 2019 16:43:32 +0000 (18:43 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 30 Sep 2019 16:43:32 +0000 (18:43 +0200)
1  2 
wcfsetup/install/files/acp/templates/contactSettings.tpl patch | diff1 | diff2 | blob | history
wcfsetup/install/lang/de.xml patch | diff1 | diff2 | blob | history

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