Merge branch 'master' into 14078-obtain-configuration-data-from-discovery-endpoint
authorMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Tue, 21 Aug 2018 12:25:29 +0000 (14:25 +0200)
committerMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Tue, 21 Aug 2018 12:25:29 +0000 (14:25 +0200)
refs #14078

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

1  2 
src/services/services.ts

Simple merge