Merge branch '5.2' into 5.3
authorMatthias Schmidt <gravatronics@live.com>
Tue, 3 Nov 2020 10:14:50 +0000 (11:14 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 3 Nov 2020 10:14:50 +0000 (11:14 +0100)
commit012d5e5dbe4a06833f012aa2320c191fd65e49d8
treeaded9cf4d607462a2a9e9b27db43209f3ef33bce
parentdd40690fff626129459bbb9ddc7cb66aa2921063
parentf3d0b560fbc5b38cec2212c656da1b1026ec851f
Merge branch '5.2' into 5.3
com.woltlab.wcf/templates/__pollOptionsFormField.tpl
wcfsetup/install/files/acp/templates/__pollOptionsFormField.tpl