16719: Merge branch 'master' into 16719-collection-version-basic-ui
authorLucas Di Pentima <lucas@di-pentima.com.ar>
Tue, 20 Oct 2020 21:32:23 +0000 (18:32 -0300)
committerLucas Di Pentima <lucas@di-pentima.com.ar>
Tue, 20 Oct 2020 21:32:23 +0000 (18:32 -0300)
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>

1  2 
src/components/icon/icon.tsx
src/index.tsx

Simple merge
diff --cc src/index.tsx
Simple merge