Merge pull request #514 from ziollek/docker_for_run_test

author gthess <george@nlnetlabs.nl>

Thu, 12 Aug 2021 19:30:36 +0000 (21:30 +0200)

committer GitHub <noreply@github.com>

Thu, 12 Aug 2021 19:30:36 +0000 (21:30 +0200)
author gthess <george@nlnetlabs.nl>
Thu, 12 Aug 2021 19:30:36 +0000 (21:30 +0200)
committer GitHub <noreply@github.com>
Thu, 12 Aug 2021 19:30:36 +0000 (21:30 +0200)
diff --cc Makefile.in
Simple merge
diff --cc configure.ac
Simple merge
author	gthess <george@nlnetlabs.nl>
	Thu, 12 Aug 2021 19:30:36 +0000 (21:30 +0200)
committer	GitHub <noreply@github.com>
	Thu, 12 Aug 2021 19:30:36 +0000 (21:30 +0200)
		1	2
Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history