This repository has been archived on 2024-05-31. You can view files and clone it, but cannot push or open issues or pull requests.

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
..
api.go	Merge branch 'master' into inbuilt-proxy	2021-07-17 12:49:38 +02:00
api_update.go	root: more code merging	2021-06-29 16:21:00 +02:00
api_ws.go	root: start deduplicating code	2021-06-16 12:41:34 +02:00
api_ws_msg.go	root: initial merging of outpost and main project	2021-06-16 12:02:02 +02:00
global.go	Merge branch 'master' into inbuilt-proxy	2021-07-17 12:49:38 +02:00
outpost.go	root: initial merging of outpost and main project	2021-06-16 12:02:02 +02:00