diff options
| author | Louis Vézina <[email protected]> | 2020-05-06 08:12:24 -0400 |
|---|---|---|
| committer | Louis Vézina <[email protected]> | 2020-05-06 08:12:24 -0400 |
| commit | 6fd6ee234c6069f569e6507d19b90ea16b6a2107 (patch) | |
| tree | 00bba5846409e19139fd25d2a7f9f07f77350284 /.gitignore | |
| parent | 018d18840e4a11aed7b507a8c6f1bf74cfcdccef (diff) | |
| parent | ea792a09f19e9b863cdccb69a9e3dafdfb0fd204 (diff) | |
| download | bazarr-6fd6ee234c6069f569e6507d19b90ea16b6a2107.tar.gz bazarr-6fd6ee234c6069f569e6507d19b90ea16b6a2107.zip | |
Merge branch 'development' into hermes
# Conflicts:
# .gitignore
# bazarr/main.py
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 0bac645ee..452c43001 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ cachefile.dbm *.log *.log.* *.db +*.pyc .idea/* bazarr.pid /venv @@ -10,6 +11,7 @@ bazarr.pid static/scss/.sass-cache/* static/scss/.sass-cache *.scssc +/.vscode # Allow !*.dll
\ No newline at end of file |