Merge branch 'master' into dev

This commit is contained in:
Nick O'Leary
2020-05-04 11:41:44 +01:00
18 changed files with 198 additions and 73 deletions

View File

@@ -553,7 +553,7 @@ function getFlow(id) {
if (flow.label) {
result.label = flow.label;
}
if (flow.disabled) {
if (flow.hasOwnProperty('disabled')) {
result.disabled = flow.disabled;
}
if (flow.hasOwnProperty('info')) {