Jens Langhammer f016095891 Merge branch 'master' into openapi-v3 ... Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org> # Conflicts: # Pipfile.lock		2021-05-17 20:37:18 +02:00
..
ak	Merge branch 'master' into openapi-v3	2021-05-16 21:36:24 +02:00
ldap	outpost: use shorter API Calls	2021-05-16 21:35:23 +02:00
proxy	outpost: use shorter API Calls	2021-05-16 21:35:23 +02:00
version.go	release: 2021.5.2	2021-05-17 19:54:10 +02:00