projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
47be45a
bde89ca
)
Merge branch 'main' into 17748-extra-claims
author
Nico Cesar <nico@nicocesar.com>
Thu, 8 Jul 2021 16:02:57 +0000
(12:02 -0400)
committer
Nico Cesar <nico@nicocesar.com>
Thu, 8 Jul 2021 16:10:23 +0000
(12:10 -0400)
Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico@curii.com>
1
2
lib/controller/localdb/login_oidc_test.go
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/controller/localdb/login_oidc_test.go
Simple merge