Merge branch 'master' into next
authorJoshua Rüsweg <ruesweg@woltlab.com>
Tue, 30 Jul 2019 13:46:07 +0000 (15:46 +0200)
committerJoshua Rüsweg <ruesweg@woltlab.com>
Tue, 30 Jul 2019 13:46:07 +0000 (15:46 +0200)
commitf412627cd16c6bee994eeb1f12ee2653a7f6ae9b
tree2d1669b41754bf53310cc0ad64ba45f44862974f
parenta4e65a9e8c0b5fb607961fadb10610fa716cb62a
parentc01108050acd670524675923759ddf086242e61a
Merge branch 'master' into next
wcfsetup/install/files/acp/templates/userTrophyAdd.tpl
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml