Merge branch 'DoorDev' into DoorDevUnstable
# Conflicts: # Main.py # RELEASENOTES.md
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -36,3 +36,4 @@ get-pip.py
|
||||
|
||||
venv
|
||||
test
|
||||
data/base2current.json
|
||||
|
||||
Reference in New Issue
Block a user