Merge branch 'master' into 13990-collection-files-service-based-on-webdav
authorMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Fri, 17 Aug 2018 13:47:30 +0000 (15:47 +0200)
committerMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Fri, 17 Aug 2018 13:47:30 +0000 (15:47 +0200)
commita71b18d036e642ace1ae4bdd06f7df8409faf1b4
tree373319d484e17c022586daa84b2cc003cdb6aaa6
parent52481255ee28ad3e4e69cbdb8a03cbf63546a0ce
parentc956bd958d3fb90ce51d758fb99d1d88cf589062
Merge branch 'master' into 13990-collection-files-service-based-on-webdav

refs #13990

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
src/services/collection-service/collection-service.ts
src/views/workbench/workbench.tsx