Merge branch 'master' into 15106-trgm-text-search
authorEric Biagiotti <ebiagiotti@veritasgenetics.com>
Mon, 10 Jun 2019 14:07:59 +0000 (10:07 -0400)
committerEric Biagiotti <ebiagiotti@veritasgenetics.com>
Mon, 10 Jun 2019 14:07:59 +0000 (10:07 -0400)
commit442a871e7f3476938d0ebb3adbe3b9a7742f03ad
tree9babbc75a4ffc64e242bcfa5606efb10d064c083
parent9d4c7ff603f22844dc80c7f38c938a678273c9c1
parenta061ac1788c67e7f0107a80c63005af328306afa
Merge branch 'master' into 15106-trgm-text-search

refs #15106

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>
services/api/app/models/arvados_model.rb