Merge branch 'master' into mfa-meta
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 9 Dec 2020 09:22:16 +0000 (10:22 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 9 Dec 2020 09:22:16 +0000 (10:22 +0100)
commit34a6cf98a2751e21c236bc296d99f73361ea118d
tree06a18c8beb31879a5bd26bec0a9cc8d46464eb39
parent8762354694b21bc72b1b6cc127d02f693c64855e
parentc9b1a9af5c7ab07b7ea6d5313ee7405dd995d663
Merge branch 'master' into mfa-meta

For #3764.
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml