projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af1125b 8c30c64)
13752: Merge branch 'master' into 13752-migrate-index-data
authorTom Clegg <tclegg@veritasgenetics.com>
Tue, 18 Sep 2018 19:43:28 +0000 (15:43 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Tue, 18 Sep 2018 19:43:28 +0000 (15:43 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

1  2 
services/api/app/models/collection.rb patch | diff1 | diff2 | blob | history

diff --cc services/api/app/models/collection.rb
Simple merge