Merge branch 'develop' into fix/ldap-auth-issues

author Mark Felder <feld@FreeBSD.org>

Fri, 7 Aug 2020 19:55:22 +0000 (14:55 -0500)

committer Mark Felder <feld@FreeBSD.org>

Fri, 7 Aug 2020 19:55:22 +0000 (14:55 -0500)
author Mark Felder <feld@FreeBSD.org>
Fri, 7 Aug 2020 19:55:22 +0000 (14:55 -0500)
committer Mark Felder <feld@FreeBSD.org>
Fri, 7 Aug 2020 19:55:22 +0000 (14:55 -0500)
diff --cc CHANGELOG.md
Simple merge
diff --cc config/config.exs
Simple merge
diff --cc docs/configuration/cheatsheet.md
Simple merge
author	Mark Felder <feld@FreeBSD.org>
	Fri, 7 Aug 2020 19:55:22 +0000 (14:55 -0500)
committer	Mark Felder <feld@FreeBSD.org>
	Fri, 7 Aug 2020 19:55:22 +0000 (14:55 -0500)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
config/config.exs	patch \|	diff1 \|	diff2 \|	blob \| history
docs/configuration/cheatsheet.md	patch \|	diff1 \|	diff2 \|	blob \| history