]> git.arvados.org - arvados.git/commit
Merge branch '2640-folder-api' into 1970-folder-view
authorTom Clegg <tom@curoverse.com>
Mon, 5 May 2014 22:33:04 +0000 (18:33 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 5 May 2014 22:33:04 +0000 (18:33 -0400)
commitdb1e389b74e37ecf4915168acdc72ea9ef624d9c
tree0b7331d999d3290965d30a7149900b5d6f7907ce
parent7871e324112f24527031f4100e4131ff2c6ab245
parent43bcfeaa2d9953ff03f34c65b95be9e386152362
Merge branch '2640-folder-api' into 1970-folder-view

Conflicts:
apps/workbench/app/controllers/application_controller.rb
services/api/app/controllers/application_controller.rb
apps/workbench/app/controllers/application_controller.rb
services/api/app/controllers/arvados/v1/groups_controller.rb
services/api/app/models/arvados_model.rb