From: Tom Clegg <tom@tomclegg.ca>
Date: Wed, 17 Jun 2020 16:35:32 +0000 (-0400)
Subject: Merge branch '16171-oidc-config'
X-Git-Tag: 2.1.0~192
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/664b5469124c6936733ce6544393f3883b86a32f

Merge branch '16171-oidc-config'

closes #16171

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>
---

664b5469124c6936733ce6544393f3883b86a32f