Merge upstream

This commit is contained in:
cryobry
2020-11-09 10:48:40 -05:00
parent 302702efe3
commit 7ac6c775a6
10 changed files with 91 additions and 31 deletions

2
.gitignore vendored
View File

@@ -29,7 +29,7 @@ wheels/
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
#*.spec
*.spec
# Installer logs
pip-log.txt