projects / arvados-workbench2.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5248125 c956bd9)
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)
refs #13990

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

1  2 
src/services/collection-service/collection-service.ts patch | diff1 | diff2 | blob | history
src/views/workbench/workbench.tsx patch | diff1 | diff2 | blob | history

diff --cc src/views/workbench/workbench.tsx
Simple merge