projects
/
arvados-workbench2.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
044eba1
a080578
)
Merge branch 'master' into 13883-arrow-animation-is-not-working-after-loading
author
Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Thu, 26 Jul 2018 07:22:44 +0000
(09:22 +0200)
committer
Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Thu, 26 Jul 2018 07:22:44 +0000
(09:22 +0200)
refs #13883
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
1
2
src/components/tree/tree.tsx
patch
|
diff1
|
diff2
|
blob
|
history
src/store/navigation/navigation-action.ts
patch
|
diff1
|
diff2
|
blob
|
history
src/store/project/project-reducer.test.ts
patch
|
diff1
|
diff2
|
blob
|
history
src/store/project/project-reducer.ts
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/components/tree/tree.tsx
Simple merge
diff --cc
src/store/navigation/navigation-action.ts
Simple merge
diff --cc
src/store/project/project-reducer.test.ts
Simple merge
diff --cc
src/store/project/project-reducer.ts
Simple merge