Jens Langhammer ab2bd622a8 Merge branch 'master' into openapi-v3 ... Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org> # Conflicts: # outpost/pkg/ak/api.go # outpost/pkg/ak/global.go # outpost/pkg/ldap/instance_bind.go		2021-05-16 21:36:24 +02:00
..
api.go	outpost: use shorter API Calls	2021-05-16 21:35:23 +02:00
api_uag.go	…
api_update.go	outpost: use shorter API Calls	2021-05-16 21:35:23 +02:00
api_ws.go	outposts: send build hash as part of hello	2021-05-12 19:02:04 +02:00
api_ws_msg.go	…
cert.go	…
global.go	outpost: migrate to openapitools/openapi-generator-cli	2021-05-16 21:07:01 +02:00
outpost.go	…