Merge branch 'master' into 2640-folder-api
authorTom Clegg <tom@curoverse.com>
Wed, 30 Apr 2014 18:14:15 +0000 (14:14 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 30 Apr 2014 18:14:15 +0000 (14:14 -0400)
1  2 
services/api/app/controllers/application_controller.rb
services/api/app/models/arvados_model.rb