projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
59442e1
a789502
)
Merge branch '15795-sys-root-token' refs #15795
author
Peter Amstutz <pamstutz@veritasgenetics.com>
Tue, 26 Nov 2019 20:06:42 +0000
(15:06 -0500)
committer
Peter Amstutz <pamstutz@veritasgenetics.com>
Tue, 26 Nov 2019 20:06:42 +0000
(15:06 -0500)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@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