Merge branch 'master' into 16811-public-favs
authorPeter Amstutz <peter.amstutz@curii.com>
Tue, 22 Sep 2020 19:57:34 +0000 (15:57 -0400)
committerPeter Amstutz <peter.amstutz@curii.com>
Tue, 22 Sep 2020 19:57:34 +0000 (15:57 -0400)
commit7499f61a2912cfdb1a316808fafa6e6ee77ee2e0
treedc9f23f2836f92b2680469b973d37754e8b8c694
parenta13547aec78a75da2174e083f6015280787cd597
parente97a5d828bdf7cb9626d72efd94d3bcf718a18c9
Merge branch 'master' into 16811-public-favs

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
services/api/app/models/arvados_model.rb