From: Peter Amstutz <peter.amstutz@curii.com>
Date: Thu, 12 Dec 2019 16:07:32 +0000 (-0500)
Subject: Merge branch '15256-removing-files-during-upload'
X-Git-Tag: 2.0.0~21
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/e83b5a007f55a47a9acfa5c363c3f9f3bc7495de

Merge branch '15256-removing-files-during-upload'

Made a mistake with previous merge, merged old branch instead of new
one.  Fixed.

refs #15256

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---

e83b5a007f55a47a9acfa5c363c3f9f3bc7495de