Merge branch 'main' of gitea.mintcalc.com:typst4ei/TUM-typst4ei

# Conflicts: # requirements.txt
2026-01-30 12:11:42 +01:00
parent cb23a4fc2b 0f1f9e84cb
commit 8b8fc9cd83
18 changed files with 658 additions and 150 deletions
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,8 +11,16 @@ idna==3.11
 Jinja2==3.1.6
 MarkupSafe==3.0.3
 pydantic==2.12.5
+pydantic-settings==2.12.0
 pydantic_core==2.41.5
+<<<<<<< HEAD
 starlette==0.50.0
+=======
+python-dotenv==1.2.1
+PyYAML==6.0.3
+starlette==0.38.6
+tornado==6.5.4
+>>>>>>> 0f1f9e84cbed6b0e9027627cc14355db81c4fa83
 typing-inspection==0.4.2
 typing_extensions==4.15.0
 uvicorn==0.40.0