projects / arvados-workbench2.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f26a160 f22b322)
Merge branch 'master' of git.curoverse.com:arvados-workbench2 into 13862-collection...
authorMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Thu, 11 Oct 2018 19:00:15 +0000 (21:00 +0200)
committerMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Thu, 11 Oct 2018 19:00:15 +0000 (21:00 +0200)
refs #2
13862

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

1  2 
package.json patch | diff1 | diff2 | blob | history
src/views/workbench/workbench.tsx patch | diff1 | diff2 | blob | history

diff --cc package.json
Simple merge
diff --cc src/views/workbench/workbench.tsx
Simple merge