From be4c8fddc6237621e19384e6f6cb97e18383ea1c Mon Sep 17 00:00:00 2001
From: Jay <admin@trj.tw>
Date: Thu, 4 May 2017 17:42:22 +0800
Subject: [PATCH] merge master

---
 config.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.json b/config.json
index c87d33b..d1cdf5a 100644
--- 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"
     }
-}
+}
\ No newline at end of file