From: Tom Clegg <tom@tomclegg.ca>
Date: Mon, 8 Jun 2020 14:17:55 +0000 (-0400)
Subject: Merge branch '16171-oidc'
X-Git-Tag: 2.1.0~199
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/eadb94554a40517ebc367959e70bd41465a5ecdf

Merge branch '16171-oidc'

refs #16171

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

eadb94554a40517ebc367959e70bd41465a5ecdf