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)
commitf824f854b26dbf5e6c1d10dc3eb4689349dd71fe
tree68354043afb6055a85875e9be1e45bd516fe88bf
parent2bcd1451cbcad6e96610f0ddfe14a19f8dd4a3ba
parent2755c8e5060fc5f84c91e089b43d5019c84cd93b
Merge branch 'master' into 9333-api-server-invalid-sql
services/api/app/models/collection.rb