From: Daniel Kos <daniel.kos@contractors.roche.com>
Date: Fri, 30 Nov 2018 07:22:14 +0000 (+0100)
Subject: Merge branch 'origin/master' into 14280-query-language
X-Git-Tag: 1.4.0~95^2~3
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/519b431a41a9ab4815a1e4180ee78395b74a85de

Merge branch 'origin/master' into 14280-query-language

# Conflicts:
#	package.json

Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>
---

519b431a41a9ab4815a1e4180ee78395b74a85de