Guy Lewin 9440bc5d72 Merge branch 'dev' into feature/detailed-errors-to-client ... # Conflicts: # models/config/server_common.go		2020-02-11 11:25:04 +02:00
..
client_common.go	support meta info for client and proxy	2019-12-08 21:01:58 +08:00
proxy.go	fix panic if set meta in proxy config, fix #1595	2020-01-06 15:43:25 +08:00
server_common.go	Merge branch 'dev' into feature/detailed-errors-to-client	2020-02-11 11:25:04 +02:00
types_test.go	update bandwidth_limit	2019-11-09 01:13:30 +08:00
types.go	update bandwidth_limit	2019-11-09 01:13:30 +08:00
value.go	conf: support render configure file using environment variables	2018-12-11 11:46:12 +08:00
visitor.go	split visitors from proxies and add health check config	2018-06-25 18:22:35 +08:00