Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Mon, 3 Jun 2019 17:35:56 +0000 (19:35 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 3 Jun 2019 17:35:56 +0000 (19:35 +0200)
commit6ff0f1ab0a7d73a5732f668e428c7d8481d771e1
tree36f82c63bafe485e2a6e29ab67f289b745684680
parentd5ef6e1eef31ae1ccae4739554afa88b63cb4c96
parent59c787fd5b75da09e6881bca9d5c0b9530ba2525
Merge branch 'master' into next
wcfsetup/install/files/lib/acp/action/UserExportGdprAction.class.php
wcfsetup/install/files/lib/acp/form/ArticleAddForm.class.php
wcfsetup/install/files/lib/acp/form/UserTrophyAddForm.class.php