Merge branch 'master' into form-link-to-created-item
authorMarcel Werk <burntime@woltlab.com>
Mon, 17 Aug 2020 16:05:15 +0000 (18:05 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 17 Aug 2020 16:05:15 +0000 (18:05 +0200)
commitb57176e8ea5641caec12374122ed8124b90070c2
tree6f139dc720cbc4f7d2f6a6792907d33a6c0c77fd
parent5916be9f2a003ea2bb54546acf0d1a478bf0cb3b
parent1c867c5cefb77bd27905bbe8acc0b02ca3c71827
Merge branch 'master' into form-link-to-created-item
wcfsetup/install/files/acp/templates/styleAdd.tpl
wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml