Merge remote-tracking branch 'origin' into 1786-replace-jekyll-with-zenweb
[arvados.git] / .gitignore
1 *~
2 *.pyc
3 docker/*/generated/*
4 docker/config.yml