Merge branch 'nc_pulse_idle_timeout' into 'master'

author Daniel Lenski <dlenski@gmail.com>

Wed, 21 Apr 2021 17:44:12 +0000 (17:44 +0000)

committer Daniel Lenski <dlenski@gmail.com>

Wed, 21 Apr 2021 17:44:12 +0000 (17:44 +0000)
author Daniel Lenski <dlenski@gmail.com>
Wed, 21 Apr 2021 17:44:12 +0000 (17:44 +0000)
committer Daniel Lenski <dlenski@gmail.com>
Wed, 21 Apr 2021 17:44:12 +0000 (17:44 +0000)
diff --cc oncp.c
Simple merge
diff --cc openconnect-internal.h
Simple merge
diff --cc pulse.c
Simple merge
author	Daniel Lenski <dlenski@gmail.com>
	Wed, 21 Apr 2021 17:44:12 +0000 (17:44 +0000)
committer	Daniel Lenski <dlenski@gmail.com>
	Wed, 21 Apr 2021 17:44:12 +0000 (17:44 +0000)
		1	2
oncp.c	patch \|	diff1 \|	diff2 \|	blob \| history
openconnect-internal.h	patch \|	diff1 \|	diff2 \|	blob \| history
pulse.c	patch \|	diff1 \|	diff2 \|	blob \| history