Merge branch 'main' into react-transition

Merge main and manually resolve merge conflicts in .gitignore.
iTechnious · Feb 5, 2022 · 97bf2d8 · 97bf2d8
2 parents 5b46bd4 + 2a32347
commit 97bf2d8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,4 @@ statics/config.py
 .vs/
 .idea/
 __pycache__/
-venv/
+venv/