Merge branch '8784-dir-listings'
authorTom Clegg <tom@curoverse.com>
Wed, 5 Jul 2017 15:39:13 +0000 (11:39 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 5 Jul 2017 15:39:13 +0000 (11:39 -0400)
refs #8784

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>

1  2 
apps/workbench/app/controllers/collections_controller.rb
apps/workbench/test/integration/collection_upload_test.rb
apps/workbench/test/integration/download_test.rb
sdk/python/tests/run_test_server.py

Simple merge