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)
commit0eb72b526bf8bbb011551ecf019f604e17a534f1
tree53d25871d881ada0bcc472b7dd6c87d2e748f484
parentad77601bb4c911f4f02797ade7daafce8fcf16e3
parente59c1d365d9b6e1eff9b5cb030a8b1a3aaf14353
Merge branch '8784-dir-listings'

refs #8784

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>
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