merge master

2017-05-04 17:42:22 +08:00 · 2017-05-04 17:42:22 +08:00 · be4c8fddc6
commit be4c8fddc6
parent a1637181fb
1 changed files with 2 additions and 2 deletions
--- a/config.json
+++ b/config.json
@ -33,7 +33,7 @@
        "schedule": true,
        "modbus": true,
        "link": true,
-        "ipcam": false,
+        "ipcam": true,
        "wristband": true,
        "server": false
    },
@ -50,4 +50,4 @@
        "version": "/factory/webioa_version",
        "ipcamsave": "/home/www/cam"
    }
-}
+}