Guy Lewin e5edfb10f7 Merge branch 'dev' into feature/tcp-multiplexing ... # Conflicts: # models/consts/consts.go		2020-03-02 09:22:32 -05:00
..
controller	Export tcp multiplexing into new proxy type	2020-02-17 11:18:40 +02:00
group	change log method	2019-10-12 20:13:12 +08:00
ports	update group ci	2018-05-23 14:39:12 +08:00
proxy	Merge branch 'dev' into feature/tcp-multiplexing	2020-03-02 09:22:32 -05:00
stats	frps dashboard api: fixup getProxyStatsByType no data return	2019-01-15 19:22:38 +08:00
control.go	feat: add multiple authentication methods, token and oidc.	2020-03-01 10:57:01 +08:00
dashboard_api.go	Export tcp multiplexing into new proxy type	2020-02-17 11:18:40 +02:00
dashboard.go	Pass server configuration as an argument	2019-08-19 15:52:08 -07:00
service.go	Merge branch 'dev' into feature/tcp-multiplexing	2020-03-02 09:22:32 -05:00