Merge branch 'multiple_auth_feature' of gitlab.com:incentive.design/openconnect

author David Woodhouse <dwmw2@infradead.org>

Fri, 15 May 2020 16:26:51 +0000 (17:26 +0100)

committer David Woodhouse <dwmw2@infradead.org>

Fri, 15 May 2020 16:26:51 +0000 (17:26 +0100)
author David Woodhouse <dwmw2@infradead.org>
Fri, 15 May 2020 16:26:51 +0000 (17:26 +0100)
committer David Woodhouse <dwmw2@infradead.org>
Fri, 15 May 2020 16:26:51 +0000 (17:26 +0100)
diff --cc .gitlab-ci.yml
Simple merge
diff --cc gnutls.c
Simple merge
diff --cc library.c
Simple merge
diff --cc openconnect.h
Simple merge
author	David Woodhouse <dwmw2@infradead.org>
	Fri, 15 May 2020 16:26:51 +0000 (17:26 +0100)
committer	David Woodhouse <dwmw2@infradead.org>
	Fri, 15 May 2020 16:26:51 +0000 (17:26 +0100)
		1	2
.gitlab-ci.yml	patch \|	diff1 \|	diff2 \|	blob \| history
gnutls.c	patch \|	diff1 \|	diff2 \|	blob \| history
library.c	patch \|	diff1 \|	diff2 \|	blob \| history
openconnect.h	patch \|	diff1 \|	diff2 \|	blob \| history