Merge branch 'dev' into zeroidc

# Conflicts:
#	.gitignore
This commit is contained in:
Grant Limberg
2021-11-11 16:20:43 -08:00
11 changed files with 129 additions and 14 deletions
+13
View File
@@ -124,3 +124,16 @@ workspace/
workspace2/
zeroidc/target/
tmp/
#snapcraft specifics
/parts/
/stage/
/prime/
*.snap
.snapcraft
__pycache__
*.pyc
*_source.tar.bz2
snap/.snapcraft