haidy edaaafbf9c Merge branch 'frp/master' ... # Conflicts: # client/control.go # cmd/frpc/sub/root.go # server/proxy.go # server/service.go		2019-01-17 21:45:16 +08:00
..
frp	添加版本号	2018-12-28 18:44:19 +08:00
frpc	Merge branch 'frp/master'	2019-01-17 21:45:16 +08:00
frps	Merge branch 'frp/master'	2019-01-17 21:45:16 +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	support ipv6	2019-01-04 22:21:57 +08:00
main.go	support ipv6	2019-01-04 22:21:57 +08:00