Merge branch 'master' into mfa-meta
authorTim Düsterhus <duesterhus@woltlab.com>
Fri, 20 Nov 2020 10:29:25 +0000 (11:29 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Fri, 20 Nov 2020 10:29:25 +0000 (11:29 +0100)
commit919a8d6584678c185bc1d43cfb7a7f85c49fb9bf
treeaca0c082e186dd7c86873f4d6c9a158a3596a624
parent5fa2488f79d7184d451bb29f5352526dfa8c6e10
parent8f15154e8719db76fd18a0d848cae54937a2e298
Merge branch 'master' into mfa-meta

For the bug fix in the email templates.
syncTemplates.json
wcfsetup/install/files/lib/system/WCFACP.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml
wcfsetup/setup/db/install.sql