Merge branch 'master' into 15530-wb2-logincluster
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Mon, 28 Oct 2019 15:52:17 +0000 (11:52 -0400)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Mon, 28 Oct 2019 15:52:17 +0000 (11:52 -0400)
commite5551bf01ddaff04ca0494013b7bab1a0978f7d1
tree9fc5f845a64874ec867b04ea1e6bb419a927ece4
parentfd4b10d0bd74546ebac751287b256ad32452a7b1
parent5df95741b820e18db893c8ce1fac67b921b7fafc
Merge branch 'master' into 15530-wb2-logincluster

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>
src/common/config.ts
src/views/login-panel/login-panel.tsx