153 Commits

Author	SHA1	Message	Date
fatedier	e805acd1e3	Merge branch 'fix_some_bugs' of https://github.com/Hurricanezwf/frp into Hurricanezwf-fix_some_bugs ... Conflicts: cmd/frpc/config.go cmd/frpc/control.go cmd/frpc/main.go cmd/frps/config.go cmd/frps/control.go cmd/frps/main.go pkg/models/server.go	2016-02-18 11:42:31 +08:00
Hurricanezwf	04c26d1c31	(1)新增心跳检测发送间隔和超时时间的配置	2016-02-05 14:36:04 +08:00
fatedier	7030d16e80	First available commit	2016-01-27 21:24:36 +08:00