projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6df0096 4fdb030)
Merge branch 'master' into 13255-account-activation
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Fri, 22 Jun 2018 20:20:42 +0000 (16:20 -0400)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Fri, 22 Jun 2018 20:35:59 +0000 (16:35 -0400)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>


Trivial merge