Merge branch '5.3'

author Matthias Schmidt <gravatronics@live.com>

Fri, 18 Dec 2020 18:35:46 +0000 (19:35 +0100)

committer Matthias Schmidt <gravatronics@live.com>

Fri, 18 Dec 2020 18:35:46 +0000 (19:35 +0100)
author Matthias Schmidt <gravatronics@live.com>
Fri, 18 Dec 2020 18:35:46 +0000 (19:35 +0100)
committer Matthias Schmidt <gravatronics@live.com>
Fri, 18 Dec 2020 18:35:46 +0000 (19:35 +0100)
diff --cc syncTemplates.json

index cc632327cbc33d84972416ffa2a721cd9b70a2e6,c490d47c3f6a0fdbdeacf888bce6ad728bae1770..a42a27462a9717538e29d53da0f57a94d1a6c0ef
--- 1/syncTemplates.json
--- 2/syncTemplates.json
+++ b/syncTemplates.json
@@@ -6,7 -6,7 +6,8 @@@
     "templates": [
       "__aclFormField",
       "__booleanFormField",
+ +    "__buttonFormField",
+     "__checkboxFormField",
       "__contentLanguageFormField",
       "__dateFormField",
       "__emailFormField",
diff --cc wcfsetup/install/files/lib/system/database/table/DatabaseTableChangeProcessor.class.php
Simple merge
author	Matthias Schmidt <gravatronics@live.com>
	Fri, 18 Dec 2020 18:35:46 +0000 (19:35 +0100)
committer	Matthias Schmidt <gravatronics@live.com>
	Fri, 18 Dec 2020 18:35:46 +0000 (19:35 +0100)
		1	2
syncTemplates.json	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/database/table/DatabaseTableChangeProcessor.class.php	patch \|	diff1 \|	diff2 \|	blob \| history