Commit Graph

8 Commits

Author SHA1 Message Date
haidy
3c114e7cd9 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	client/control.go
#	client/service.go
2018-12-13 22:44:09 +08:00
caohaidi
f930b62d9c 更新关闭服务接口 2018-11-27 14:53:32 +08:00
haidy
f3813c32a0 更新frp接口 2018-11-26 22:28:48 +08:00
fatedier
a1ac002694 update golib, fix #959 2018-11-07 21:10:47 +08:00
fatedier
941ac25648 fix ci 2018-08-10 12:02:38 +08:00
fatedier
aeb9f2b64d update golib 2018-05-29 02:08:41 +08:00
fatedier
071cbf4b15 vendor: update 2018-05-09 01:05:14 +08:00
fatedier
20fcb58437 vendor: add package golib/net 2018-05-09 00:23:42 +08:00