merge master + cr change
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Thu, 6 Sep 2018 06:36:25 +0000 (08:36 +0200)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Thu, 6 Sep 2018 06:36:25 +0000 (08:36 +0200)
commitb4a21064a6e4756b22c34f2e78bac99244fddff0
tree58d3bc8401ff2e5e784a65d5dfad9175953a6943
parent459c67708a8f880ec98ebb9eecc10299acb91d68
parentfd866f7342773ce01af4eae68cc41a978786acff
merge master + cr change

Feature #14123

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
src/store/navigation/navigation-action.ts
src/views-components/main-app-bar/main-app-bar.tsx