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
..
controller	support http load balancing	2019-07-31 00:41:58 +08:00
group	Merge branch 'frp/master'	2019-08-13 22:16:51 +08:00
ports	修复内存泄漏的问题	2019-03-07 21:45:38 +08:00
proxy	Pass server configuration as an argument	2019-08-19 15:52:08 -07:00
stats	frps dashboard api: fixup getProxyStatsByType no data return	2019-01-15 19:22:38 +08:00
control.go	let max_pool_count valid	2019-08-29 21:13:21 +08:00
dashboard_api.go	Pass server configuration as an argument	2019-08-19 15:52:08 -07:00
dashboard.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