Merge branch '3.1' into 5.2
authorMarcel Werk <burntime@woltlab.com>
Sat, 23 May 2020 17:39:18 +0000 (19:39 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 23 May 2020 17:39:18 +0000 (19:39 +0200)
commita6b5fcb2fa20da37341c41b636c0c01303138866
tree4eb25b4f15ceeec5ad62430fac7950a3ab71e6f4
parent8c7c47e14a11a852f233e898da283f31b98ef9ad
parent24e1b65a4db24604497162a907bcd748b9c7e4db
Merge branch '3.1' into 5.2
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml