projects / arvados-workbench2.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 64ccecc 97937a7)
refs #master Merge branch 'origin/master' into 14044-filter-order-simplification
authorDaniel Kos <daniel.kos@contractors.roche.com>
Fri, 17 Aug 2018 06:52:26 +0000 (08:52 +0200)
committerDaniel Kos <daniel.kos@contractors.roche.com>
Fri, 17 Aug 2018 06:52:26 +0000 (08:52 +0200)
# Conflicts:
# src/store/project/project-action.ts

Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>

1  2 
src/store/project/project-action.ts patch | diff1 | diff2 | blob | history

diff --cc src/store/project/project-action.ts
Simple merge