haidy b66cd62c0d Merge branch 'frp/master' ... # Conflicts: # client/admin_api.go # cmd/frpc/sub/root.go		2019-03-05 17:09:38 +08:00
..
conn.go	websocket: update muxer for websocket	2018-08-10 11:45:48 +08:00
http.go	frps dashboard add stcp	2018-05-20 19:06:05 +08:00
kcp.go	support ipv6	2019-01-04 22:21:57 +08:00
listener.go	更新关闭服务接口	2018-11-27 14:53:32 +08:00
tcp.go	support ipv6	2019-01-04 22:21:57 +08:00
udp.go	support ipv6	2019-01-04 22:21:57 +08:00
websocket.go	Merge branch 'frp/master'	2019-03-05 17:09:38 +08:00