Merge branch '13855-data-collection-files-card'
authorMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Fri, 3 Aug 2018 11:14:45 +0000 (13:14 +0200)
committerMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Fri, 3 Aug 2018 11:14:45 +0000 (13:14 +0200)
refs #13855

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


Trivial merge