resolved conflicts

This commit is contained in:
2025-07-04 16:58:36 +02:00
3 changed files with 69 additions and 62 deletions

1
web/.gitignore vendored
View File

@@ -25,3 +25,4 @@ logs
# bun
package-lock.json
bun.lockb