Merge branch '2640-folder-api' into 1970-folder-view
authorTom Clegg <tom@curoverse.com>
Mon, 5 May 2014 06:51:30 +0000 (02:51 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 5 May 2014 06:51:30 +0000 (02:51 -0400)
commit11c6f1d759040f2af8a68d80ae78dd57a9b2d976
treea095e280e5961224bc29214cda19360dce454bb8
parentf263c987ad0b144393edd28f281c5b19e84fdf0b
parent76e20e694fbe708e17e57a2e0b1c36aca6e8d7d0
Merge branch '2640-folder-api' into 1970-folder-view
services/api/app/controllers/application_controller.rb
services/api/app/models/arvados_model.rb