Merge branch 'master' into 14874-protected-collection-properties
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Tue, 11 Jun 2019 13:31:49 +0000 (10:31 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Tue, 11 Jun 2019 13:31:49 +0000 (10:31 -0300)
commit2cf4ea4fe0e1eda66d510983bf27fb9836af5ff4
treeb0e0e9963f65652cc234c9d3c422b4f1cb6ed1b6
parent8f9ba1d6405c397c40de94e155cea0c84120ff0c
parent8bc8c53ca9c2c834a93f1aa656771cc6b8a4e799
Merge branch 'master' into 14874-protected-collection-properties

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>
services/api/app/models/arvados_model.rb