Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0
authorMarcel Werk <burntime@woltlab.com>
Thu, 5 Apr 2018 12:00:10 +0000 (14:00 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 5 Apr 2018 12:00:10 +0000 (14:00 +0200)
commit17ad41dfd6823d6aaaaf87339f11a9a9f0782527
treee6a7f63ec3bf494cbe337b8c8f8229331484d4b8
parent1948841efe3710c5a39e12e13673d08b19ecf078
parent62eb6d1d3f946f0a3bbec95d80169f2f1c6bd890
Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml