Commit Graph
4 Commits
Author SHA1 Message Date
fatedier 84f8addd6a Move config.go to models/xxx 2016-02-18 18:24:48 +08:00
fatedier 50165053f8 Change directory structure, move models and utils to root directory 2016-02-18 16:56:55 +08:00
fatedier 30da2a2d15 Merge branch 'Hurricanezwf-fix_some_bugs' into dev 2016-02-18 11:43:19 +08:00
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