Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Fri, 1 Feb 2019 14:34:33 +0000 (15:34 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 1 Feb 2019 14:34:33 +0000 (15:34 +0100)
commit1cfc2470e527eb95290d65660fc545d130bf628b
tree72d30f49bdaee908edfef0ea007e598d81fb5ba5
parentb320989d8e8a140bff478ce150c478c6e5fd16f6
parente90f70d4346e09ed104f621f8e465ebc17877fdb
Merge branch 'master' into next
wcfsetup/install/files/acp/templates/trophyAdd.tpl