Merge branch 'master' into 5197-collection-name-owner-unique
authorRadhika Chippada <radhika@curoverse.com>
Mon, 16 Feb 2015 20:49:24 +0000 (15:49 -0500)
committerRadhika Chippada <radhika@curoverse.com>
Mon, 16 Feb 2015 20:49:24 +0000 (15:49 -0500)
commit20abd5d545f9f1102bcd28ee4cab7a2453e28cb4
tree2a31ebba10c23ada1ef94e04e932429411017b64
parent0fd86b9728a80ef07d65fbf0a8278b4a7e44c57a
parentd87717b4ec885059183ef6d7fa6780c343338455
Merge branch 'master' into 5197-collection-name-owner-unique

Conflicts:
services/api/db/structure.sql
services/api/db/structure.sql
services/api/test/unit/collection_test.rb