Merge branch 'develop' of ssh://git.brehm-online.com/var/lib/git/pixelpark/pp-admin...

author Frank Brehm <frank@brehm-online.com>

Mon, 17 Oct 2022 15:43:32 +0000 (17:43 +0200)

committer Frank Brehm <frank@brehm-online.com>

Mon, 17 Oct 2022 15:43:32 +0000 (17:43 +0200)
author Frank Brehm <frank@brehm-online.com>
Mon, 17 Oct 2022 15:43:32 +0000 (17:43 +0200)
committer Frank Brehm <frank@brehm-online.com>
Mon, 17 Oct 2022 15:43:32 +0000 (17:43 +0200)
diff --cc lib/pp_admintools/app/dns_deploy_zones.py
Simple merge
diff --cc lib/pp_admintools/app/remove_ldap_user.py
Simple merge
author	Frank Brehm <frank@brehm-online.com>
	Mon, 17 Oct 2022 15:43:32 +0000 (17:43 +0200)
committer	Frank Brehm <frank@brehm-online.com>
	Mon, 17 Oct 2022 15:43:32 +0000 (17:43 +0200)
		1	2
lib/pp_admintools/app/dns_deploy_zones.py	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pp_admintools/app/remove_ldap_user.py	patch \|	diff1 \|	diff2 \|	blob \| history