dandri/zigbee2mqtt
1
0
Fork 0
mirror of https://github.com/Koenkk/zigbee2mqtt.git synced 2026-08-28 05:24:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source 
# Conflicts:
#	npm-shrinkwrap.json
#	package.json
This commit is contained in:
Koen Kanters
2020-04-09 17:52:52 +02:00
parent 2c2af0603b 7d27a54f8f
commit 272892b112
2 changed files with 377 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files
npm-shrinkwrap.json
Generated
+375 -286
View File
File diff suppressed because it is too large Load Diff
package.json
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "zigbee2mqtt",
"version": "1.12.1-dev",
"version": "1.12.2-dev",
"description": "Zigbee to MQTT bridge using Zigbee-herdsman",
"main": "index.js",
"repository": {
@@ -45,7 +45,7 @@
"rimraf": "*",
"semver": "*",
"winston": "*",
"zigbee-herdsman": "0.12.76",
"zigbee-herdsman": "0.12.78",
"zigbee-herdsman-converters": "12.0.69"
},
"devDependencies": {