projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2bcd145 2755c8e)
Merge branch 'master' into 9333-api-server-invalid-sql
authorLucas Di Pentima <lucas@curoverse.com>
Thu, 18 Aug 2016 17:34:38 +0000 (14:34 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Thu, 18 Aug 2016 17:34:38 +0000 (14:34 -0300)
1  2 
services/api/app/models/collection.rb patch | diff1 | diff2 | blob | history

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