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

@@ -6,10 +6,12 @@
{
/// general Settings
/// * 'name' : The user friendly name of the hyperion instance (used for network things)
/// * 'versionBranch' : Which branch should be used for hyperion version
/// * 'showOptHelp' : Show option expanations at the webui. Highly recommended for beginners.
"general" :
{
"name" : "MyHyperionConfig",
"versionBranch" : "Stable",
"showOptHelp" : true
},
/// set log level: silent warn verbose debug