projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af448be 7b070fc)
Merge branch '18691-freeze-project'
authorTom Clegg <tom@curii.com>
Mon, 21 Mar 2022 14:17:29 +0000 (10:17 -0400)
committerTom Clegg <tom@curii.com>
Mon, 21 Mar 2022 14:17:29 +0000 (10:17 -0400)
refs #18691

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

1  2 
lib/config/config.default.yml patch | diff1 | diff2 | blob | history
services/api/app/models/user.rb patch | diff1 | diff2 | blob | history

diff --cc lib/config/config.default.yml
Simple merge
diff --cc services/api/app/models/user.rb
Simple merge