Merge branch 'master' into dev

This commit is contained in:
Koen Kanters committed 2020-11-05 18:07:57 +01:00
commit 752bb6c4d1
2 files changed
+549 -569

No files matched your search

+547 -567
View File
File diff suppressed because it is too large. Load diff
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "zigbee2mqtt",
"version": "1.16.0-dev",
"version": "1.16.1-dev",
"description": "Zigbee to MQTT bridge using Zigbee-herdsman",
"main": "index.js",
"repository": {
@@ -44,7 +44,7 @@
"json-stable-stringify-without-jsonify": "=1.0.1",
"mkdir-recursive": "^0.4.0",
"moment": "^2.27.0",
"mqtt": "^4.2.1",
"mqtt": "4.2.1",
"object-assign-deep": "^0.4.0",
"rimraf": "^3.0.2",
"semver": "^7.3.2",