Merge branch 'master' into 15064-wb2-fed-login
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Wed, 15 May 2019 14:30:38 +0000 (10:30 -0400)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Wed, 15 May 2019 14:30:38 +0000 (10:30 -0400)
commitfd470d8f7838b57777492289e6e4195b6c39bd2e
tree08b63b3c56f8f13587b186acbea9146affaa62af
parentf35559bdd3569d836d084524ff64ed050e3c926e
parent4b961d16b8f8ef8afbd13697a79fe4684acd0416
Merge branch 'master' into 15064-wb2-fed-login

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>
src/components/data-explorer/data-explorer.tsx
src/routes/routes.ts
src/views/collection-content-address-panel/collection-content-address-panel.tsx
src/views/search-results-panel/search-results-panel-view.tsx
src/views/workbench/workbench.tsx