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)
commitda67c81ff6cc5fd540c0725de1c8208c2d8933be
tree33f19d6b8b6f04ee349108bebf2866398e7e2740
parent9cfbcdf804974812b1a4ec514f5dc7902fce6137
parent840e7d7f96f763ae139545dca5d6dfa5a54f6cc6
Merge branch 'master' into 2640-folder-api
services/api/app/controllers/application_controller.rb
services/api/app/models/arvados_model.rb