Merge pull request #17576 from gportay/veritysetup-add-support-for-dm-verity-flags

author Lennart Poettering <lennart@poettering.net>

Sun, 17 Jan 2021 10:18:25 +0000 (11:18 +0100)

committer GitHub <noreply@github.com>

Sun, 17 Jan 2021 10:18:25 +0000 (11:18 +0100)
author Lennart Poettering <lennart@poettering.net>
Sun, 17 Jan 2021 10:18:25 +0000 (11:18 +0100)
committer GitHub <noreply@github.com>
Sun, 17 Jan 2021 10:18:25 +0000 (11:18 +0100)
diff --cc docs/ENVIRONMENT.md
Simple merge
diff --cc meson.build
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Sun, 17 Jan 2021 10:18:25 +0000 (11:18 +0100)
committer	GitHub <noreply@github.com>
	Sun, 17 Jan 2021 10:18:25 +0000 (11:18 +0100)
		1	2
docs/ENVIRONMENT.md	patch \|	diff1 \|	diff2 \|	blob \| history
meson.build	patch \|	diff1 \|	diff2 \|	blob \| history