Merge branch 'master' into django

This commit is contained in:
Nick Sweeting
2020-06-25 21:30:29 -04:00
29 changed files with 418 additions and 911 deletions

27
.gitignore vendored
View File

@@ -1,27 +1,16 @@
# OS cruft
.DS_Store
._*
# python
*.pyc
__pycache__/
.mypy_cache/
venv
.venv
archivebox/.venv
archivebox/venv
archivebox/docs/_build
# vim
.swp*
venv/
.venv/
.docker-venv/
# output artifacts
output
output/
data
data/
archivebox/output
archivebox/data
archivebox.egg-info/
*.egg-info/
build/
dist/
data/
output/