Merge remote-tracking branch 'upstream/master' into fadecandy

This commit is contained in:
Paulchen-Panther
2019-07-02 19:42:42 +02:00
15 changed files with 212 additions and 103 deletions

View File

@@ -14,13 +14,26 @@
"required" : true,
"propertyOrder" : 1
},
"versionBranch" :
{
"type" : "string",
"title" : "edt_conf_gen_versionBranch_title",
"enum" : ["Stable", "Beta"],
"required" : true,
"access" : "expert",
"default" : "Stable",
"options" : {
"enum_titles" : ["Stable", "Beta"]
},
"propertyOrder" : 2
},
"showOptHelp" :
{
"type" : "boolean",
"title" : "edt_conf_gen_showOptHelp_title",
"default" : true,
"required" : true,
"propertyOrder" : 2
"propertyOrder" : 3
}
},
"additionalProperties" : false