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)
commit0d6a8a13b9730c76edb9d491ef2e4beab71a3769
tree1ff228200e38d0535fcb09f83158db322dee3f1c
parente00d344ba8a01f2b1d7d1e01abd2f1d44b91ede1
parent78db3fb816c09fca40c21e567d1596e20bd76b22
Merge branch 'master' into next
wcfsetup/install/files/acp/templates/contactSettings.tpl
wcfsetup/install/lang/de.xml