Commit Graph

3 Commits (26479cf92aa6f0501302e1188531559c2747fb2a)

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
9 years ago
Hurricanezwf 04c26d1c31 (1)新增心跳检测发送间隔和超时时间的配置 9 years ago
fatedier 7030d16e80 First available commit 9 years ago