Merge remote-tracking branch 'origin' into 1678-new-active-user-orientation
[arvados.git] / docker / doc / Dockerfile
2013-11-26 Ward VandewegeRename docserver to doc for consistency.