Merge branch 'master' into 2257-inequality-conditions
authorTom Clegg <tom@curoverse.com>
Fri, 14 Mar 2014 14:17:46 +0000 (10:17 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 14 Mar 2014 14:17:46 +0000 (10:17 -0400)
1  2 
services/api/app/controllers/application_controller.rb
services/api/app/models/arvados_model.rb