Merge branch 'master' into 4523-full-text-search
authorRadhika Chippada <radhika@curoverse.com>
Thu, 22 Jan 2015 05:32:42 +0000 (00:32 -0500)
committerRadhika Chippada <radhika@curoverse.com>
Thu, 22 Jan 2015 05:32:42 +0000 (00:32 -0500)
commiteeebd1e25974beff2455c96100532aaa4dae68fb
treeea9b9239cc4197f9964fe5776f0292e47ebce03a
parentc430a289af3eeed00e220b5658f9d64191798b1c
parent224701a0e17975957d3fcc0262c50806e2a7698d
Merge branch 'master' into 4523-full-text-search
services/api/app/models/arvados_model.rb