Merge branch '3.1' into 5.2
authorjoshuaruesweg <ruesweg@woltlab.com>
Tue, 26 May 2020 09:31:29 +0000 (11:31 +0200)
committerjoshuaruesweg <ruesweg@woltlab.com>
Tue, 26 May 2020 09:31:29 +0000 (11:31 +0200)
commit069c641e3e3007bd509ebb896fc1c4c009fa2ceb
tree73665e066c0a76b08e2eb80b07024bf571a2ad58
parentec9ea56ee40cedb8a89e472b58cd74db4845cd04
parent796379b93976885ddc47d429f8b1466fa8da9dbe
Merge branch '3.1' into 5.2
wcfsetup/install/files/acp/templates/userTrophyAdd.tpl