Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sun, 24 Jun 2018 07:14:28 +0000 (09:14 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 24 Jun 2018 07:14:28 +0000 (09:14 +0200)
commita7eeb725df4504c69085927afc39d50e7a947869
tree5dcda91c6164e9752917b4fbe8751a52fab1ba81
parent37ddf90a11ffea99a45b40d4548d964dae0629fe
parentc0bec9cc661ea01d416b86103e191a8bdcea2f9a
Merge branch 'master' into next
wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
wcfsetup/install/files/lib/form/EmailNewActivationCodeForm.class.php