Merge pull request #21170 from keszybz/delibgcryptify

author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

Fri, 3 Dec 2021 12:44:53 +0000 (13:44 +0100)

committer GitHub <noreply@github.com>

Fri, 3 Dec 2021 12:44:53 +0000 (13:44 +0100)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 3 Dec 2021 12:44:53 +0000 (13:44 +0100)
committer GitHub <noreply@github.com>
Fri, 3 Dec 2021 12:44:53 +0000 (13:44 +0100)
diff --cc TODO
Simple merge
diff --cc meson.build
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Fri, 3 Dec 2021 12:44:53 +0000 (13:44 +0100)
committer	GitHub <noreply@github.com>
	Fri, 3 Dec 2021 12:44:53 +0000 (13:44 +0100)
		1	2
TODO	patch \|	diff1 \|	diff2 \|	blob \| history
meson.build	patch \|	diff1 \|	diff2 \|	blob \| history