From 712ef81c6b8813a498a66cf61ffcd37e5c502c8c Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期五, 01 十一月 2019 13:45:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 go.mod |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index ee4e5ce..3e53878 100644
--- a/go.mod
+++ b/go.mod
@@ -3,11 +3,12 @@
 go 1.12
 
 require (
-	basic.com/dbapi.git v0.0.0-20191029073251-acc3826d096d // indirect
+	basic.com/dbapi.git v0.0.0-20191031093340-2802ead93fa6 // indirect
 	basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb // indirect
+	basic.com/gb28181api.git v0.0.0-20191028082253-472438a8407b // indirect
 	basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48 // indirect
-	basic.com/pubsub/esutil.git v0.0.0-20191029091908-d43f2d92ecb6 // indirect
-	basic.com/pubsub/protomsg.git v0.0.0-20190829113947-eb5a5f99a745
+	basic.com/pubsub/esutil.git v0.0.0-20191031110806-0712822ce390 // indirect
+	basic.com/pubsub/protomsg.git v0.0.0-20191031110456-1a84b09fbcd1 // indirect
 	basic.com/valib/capture.git v0.0.0-20190924061718-7e98d8c98b3c // indirect
 	basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051
 	basic.com/valib/goffmpeg.git v0.0.0-20191024085028-080acae08ec8 // indirect

--
Gitblit v1.8.0