Jens Langhammer b3159a74e5 Merge branch 'master' into inbuilt-proxy ... Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org> # Conflicts: # Dockerfile # internal/outpost/ak/api.go # internal/outpost/ak/api_uag.go # internal/outpost/ak/global.go # internal/outpost/ldap/api_tls.go # internal/outpost/ldap/instance_bind.go # internal/outpost/ldap/utils.go # internal/outpost/proxy/api_bundle.go # outpost/go.mod # outpost/go.sum # outpost/pkg/ak/cert.go		2021-07-17 12:49:38 +02:00
..
middleware_log.go	root: initial go proxy, update compose and helm	2021-05-03 09:39:09 +02:00
middleware_sentry.go	root: initial go proxy, update compose and helm	2021-05-03 09:39:09 +02:00
web.go	root: more code merging	2021-06-29 16:21:00 +02:00
web_proxy.go	web/admin: fix BoundPoliciesList's edit policy button not working	2021-06-02 18:00:26 +02:00
web_ssl.go	gproxy: listen on tls	2021-05-03 23:19:22 +02:00
web_static.go	root: build bundled docs into helo dir to fix path issue with packaged static files	2021-07-13 19:09:16 +02:00
web_utils.go	gproxy: listen on tls	2021-05-03 23:19:22 +02:00