Merge branch 'master' into smtp-options
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 13 Jul 2021 14:44:01 +0000 (16:44 +0200)
committerGitHub <noreply@github.com>
Tue, 13 Jul 2021 14:44:01 +0000 (16:44 +0200)
commita7c618d3f72cb1e99847b80d59f3ea7d3ade2f62
tree3ff0d4490906cadaa3252d22e2aeab6c77c8da6f
parent833cd754ad98143621c37079967109bc7a22fe63
parentfd2fbc29b9c22a6212eec938cbdc23bc99faf3b8
Merge branch 'master' into smtp-options
com.woltlab.wcf/option.xml
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml