Merge branch 'master' of https://github.com/ioBroker/ioBroker.javascript

# Conflicts: # gulpfile.js
ioBroker · May 17, 2020 · d2e5ed8 · d2e5ed8
2 parents adabdfe + 03524b9
commit d2e5ed8
Show file tree

Hide file tree

Showing 90 changed files with 5,362 additions and 3,507 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -32,5 +32,8 @@
             "error",
             "always"
         ]
+    },
+    "parserOptions": {
+        "ecmaVersion": 2019
     }
 }
diff --git a/admin/vs/base/browser/ui/codiconLabel/codicon/codicon.ttf b/admin/vs/base/browser/ui/codiconLabel/codicon/codicon.ttf
diff --git a/admin/vs/base/worker/workerMain.js b/admin/vs/base/worker/workerMain.js
diff --git a/admin/vs/basic-languages/abap/abap.js b/admin/vs/basic-languages/abap/abap.js
diff --git a/admin/vs/basic-languages/apex/apex.js b/admin/vs/basic-languages/apex/apex.js
diff --git a/admin/vs/basic-languages/azcli/azcli.js b/admin/vs/basic-languages/azcli/azcli.js
diff --git a/admin/vs/basic-languages/bat/bat.js b/admin/vs/basic-languages/bat/bat.js
diff --git a/admin/vs/basic-languages/cameligo/cameligo.js b/admin/vs/basic-languages/cameligo/cameligo.js