merge master

This commit is contained in:
Jay 2017-05-04 17:42:22 +08:00
parent a1637181fb
commit be4c8fddc6

View File

@ -33,7 +33,7 @@
"schedule": true, "schedule": true,
"modbus": true, "modbus": true,
"link": true, "link": true,
"ipcam": false, "ipcam": true,
"wristband": true, "wristband": true,
"server": false "server": false
}, },