From: Tom Clegg <tclegg@veritasgenetics.com>
Date: Fri, 20 Apr 2018 19:56:12 +0000 (-0400)
Subject: 13111: Merge branch 'master' into 13111-webdav-projects
X-Git-Tag: 1.2.0~199^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/134815098b060c232d1eee381d1eeb8e9d6162ff

13111: Merge branch 'master' into 13111-webdav-projects

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
---

134815098b060c232d1eee381d1eeb8e9d6162ff