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
..
frp	frp client	2019-08-03 21:25:48 +08:00
frpc	Merge branch 'frp/master'	2019-10-03 14:19:23 +08:00
frps	Merge branch 'frp/master'	2019-10-03 14:19:23 +08:00
macFrp	for mac support 10.11	2019-01-03 21:53:58 +08:00
frpc.ini	更新至最新代码	2018-12-14 08:50:55 +08:00
frps.ini	合并最新代码	2019-03-05 22:31:51 +08:00
main.go	support ipv6	2019-01-04 22:21:57 +08:00