refs #13856 Merge branch 'origin/13856-upload-component'
authorDaniel Kos <daniel.kos@contractors.roche.com>
Tue, 7 Aug 2018 11:34:15 +0000 (13:34 +0200)
committerDaniel Kos <daniel.kos@contractors.roche.com>
Tue, 7 Aug 2018 11:34:15 +0000 (13:34 +0200)
commit40952ad86a823635968c9abc5d6feacef316cffd
tree9a6fa8627d6351b65e89dbe82d51cfd653c4a6bb
parente1aac257a34c4c0210ea1663a7f6dd0b9c482e5d
parenta8198231beab18f4dd24f7538791a66dd698d028
refs #13856 Merge branch 'origin/13856-upload-component'

# Conflicts:
# src/services/services.ts
# src/views-components/dialog-create/dialog-collection-create.tsx
# src/views-components/dialog-update/dialog-collection-update.tsx

Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>
src/services/services.ts
src/services/tag-service/tag-service.ts
src/views-components/dialog-create/dialog-collection-create.tsx
src/views-components/dialog-update/dialog-collection-update.tsx