Commit Graph

6 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
60c9804776 format代码 2016-02-05 16:49:52 +08:00
Hurricanezwf
5d6f37aa82 (1)优化重连和心跳检测 2016-02-05 14:18:26 +08:00
fatedier
fa9356936b Use go fmt before build 2016-02-03 18:46:24 +08:00
fatedier
79195d7177 Change internal package import to github/fatedier 2016-02-03 18:23:30 +08:00
fatedier
7030d16e80 First available commit 2016-01-27 21:24:36 +08:00