Merge 'origin/master' into 13753-favorites-view
authorDaniel Kos <daniel.kos@contractors.roche.com>
Tue, 24 Jul 2018 10:09:44 +0000 (12:09 +0200)
committerDaniel Kos <daniel.kos@contractors.roche.com>
Tue, 24 Jul 2018 10:09:44 +0000 (12:09 +0200)
commit224cde8bd16074b2755cedf44ae048340bc82969
treeda64e5f31346db065e509ab75511860bb9da03e3
parentdd01c37f3cc8b741e4202c480271eb2ffa6a3021
parent39c6f239172d5f2d92341f6c31de32e7c02ffa2d
Merge 'origin/master' into 13753-favorites-view

# Conflicts:
# src/services/favorite-service/favorite-service.ts
# src/store/store.ts
# src/views-components/context-menu/context-menu.tsx

Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>
src/services/favorite-service/favorite-service.ts
src/store/store.ts
src/views/workbench/workbench.tsx