haidy 59aa7cd710 Merge branch 'frp/master' ... # Conflicts: # client/admin_api.go # client/control.go # client/proxy/proxy.go # client/service.go # client/visitor.go # cmd/frpc/sub/root.go # server/service.go		2019-10-03 14:19:23 +08:00
..
event	mv folders	2018-12-09 22:06:22 +08:00
health	fix health check bug, fix #1367	2019-08-09 12:47:27 +08:00
proxy	Merge branch 'frp/master'	2019-10-03 14:19:23 +08:00
admin_api.go	Merge branch 'frp/master'	2019-10-03 14:19:23 +08:00
admin.go	Merge branch 'frp/master'	2019-10-03 14:19:23 +08:00
control.go	Merge branch 'frp/master'	2019-10-03 14:19:23 +08:00
service.go	Merge branch 'frp/master'	2019-10-03 14:19:23 +08:00
visitor_manager.go	frpc: support health check	2018-12-07 18:40:17 +08:00
visitor.go	Merge branch 'frp/master'	2019-10-03 14:19:23 +08:00