projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7a2e860
3d5e303
)
Merge branch '15795-sys-root-token'
author
Tom Clegg <tclegg@veritasgenetics.com>
Thu, 28 Nov 2019 15:19:46 +0000
(10:19 -0500)
committer
Tom Clegg <tclegg@veritasgenetics.com>
Thu, 28 Nov 2019 15:19:46 +0000
(10:19 -0500)
refs #15795
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
1
2
services/api/app/models/api_client_authorization.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/api/app/models/api_client_authorization.rb
Simple merge
projects / arvados.git / commitdiff