Merge commit 'b5a2b4e6d1b958dbb3ad702026889172514c1fd6'

2025-05-08 01:36:25 -04:00
parent 1432d7aca1 b5a2b4e6d1
commit cf6b74ce7e
18 changed files with 599 additions and 567 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -4,9 +4,12 @@ __pycache__
 *.pyd
 *.env
 *venv/
-*.git
+.git
 .gitignore
 Dockerfile
 docker-compose.yml
 log.md
-.vscode
+<<<<<<< HEAD
+.vscode
+=======
+>>>>>>> b5a2b4e6d1b958dbb3ad702026889172514c1fd6