refs #master Merge branch 'origin/master' into 13986-projects-list-and-default-routing
authorDaniel Kos <daniel.kos@contractors.roche.com>
Fri, 17 Aug 2018 06:55:56 +0000 (08:55 +0200)
committerDaniel Kos <daniel.kos@contractors.roche.com>
Fri, 17 Aug 2018 06:55:56 +0000 (08:55 +0200)
commiteb4491eea9ba873845f7a5796d139d19977f8112
tree390579b9a789a3aa4ce511199f5f3d2f552b13b7
parent9f1bcc2882ee4b7581192f992b042187e6fe39e8
parentb13fa1f0403b854ccb4b0a2f75323984581bf877
refs #master Merge branch 'origin/master' into 13986-projects-list-and-default-routing

# Conflicts:
# src/store/navigation/navigation-action.ts

Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>
src/store/navigation/navigation-action.ts
src/store/side-panel/side-panel-reducer.ts