projects / arvados-workbench2.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e99be6 abf519d)
Merge conflicts
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Wed, 6 Jun 2018 13:18:59 +0000 (15:18 +0200)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Wed, 6 Jun 2018 13:22:21 +0000 (15:22 +0200)
Feature #13535

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>


Trivial merge