projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ef35a53
2e727c5
)
Merge branch '19146-can-write-manage'
author
Tom Clegg <tom@curii.com>
Mon, 13 Jun 2022 18:30:59 +0000
(14:30 -0400)
committer
Tom Clegg <tom@curii.com>
Mon, 13 Jun 2022 18:30:59 +0000
(14:30 -0400)
refs #19146
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
1
2
services/api/app/models/user.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/api/app/models/user.rb
Simple merge