Merge branch '2640-folder-api' into 1970-folder-view

author Tom Clegg <tom@curoverse.com>

Sat, 3 May 2014 03:20:56 +0000 (23:20 -0400)

committer Tom Clegg <tom@curoverse.com>

Sat, 3 May 2014 03:20:56 +0000 (23:20 -0400)
author Tom Clegg <tom@curoverse.com>
Sat, 3 May 2014 03:20:56 +0000 (23:20 -0400)
committer Tom Clegg <tom@curoverse.com>
Sat, 3 May 2014 03:20:56 +0000 (23:20 -0400)
diff --cc apps/workbench/app/models/arvados_resource_list.rb
Simple merge
diff --cc services/api/app/controllers/application_controller.rb
Simple merge
author	Tom Clegg <tom@curoverse.com>
	Sat, 3 May 2014 03:20:56 +0000 (23:20 -0400)
committer	Tom Clegg <tom@curoverse.com>
	Sat, 3 May 2014 03:20:56 +0000 (23:20 -0400)
		1	2
apps/workbench/app/models/arvados_resource_list.rb	patch \|	diff1 \|	diff2 \|	blob \| history
services/api/app/controllers/application_controller.rb	patch \|	diff1 \|	diff2 \|	blob \| history