Merge branch 'master' into 14015-rename-a-file
authorMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Mon, 20 Aug 2018 12:03:21 +0000 (14:03 +0200)
committerMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Mon, 20 Aug 2018 12:03:21 +0000 (14:03 +0200)
commit6ff11e5f5dba8e02a176bbe9455ba916e8990028
tree2ca7f50de784fdeffb08354eab264dd42daf8ef4
parent42f46bf682cf6590b1d87424d616c5c9b9c9154d
parent9c73ce8f871a403f2d9e15fbb15ef58fa6adc64c
Merge branch 'master' into 14015-rename-a-file

refs #14015

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
src/services/collection-service/collection-service.ts
src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts