Merge branch '5.2'
authorMarcel Werk <burntime@woltlab.com>
Fri, 29 May 2020 18:53:35 +0000 (20:53 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 29 May 2020 18:53:35 +0000 (20:53 +0200)
commitc78017c788738c0769c63db5accf057db04dee08
treee557265ed252fa301ed51d31edd326d48af84f36
parent96a042162b3e9c851e0c358d12edb14be444c036
parent701eb30efe8535691f7dae9be1914c7ea7d09cca
Merge branch '5.2'
com.woltlab.wcf/option.xml
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml