Merge branch 'master' into 16941-inactive-remotes 16941-inactive-remotes
authorPeter Amstutz <peter.amstutz@curii.com>
Mon, 5 Oct 2020 20:08:21 +0000 (16:08 -0400)
committerPeter Amstutz <peter.amstutz@curii.com>
Mon, 5 Oct 2020 20:08:21 +0000 (16:08 -0400)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

1  2 
src/services/auth-service/auth-service.ts
src/store/auth/auth-action-session.ts

Simple merge