Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.pre-commit-config.yaml
#	.python-version
#	Dockerfile
#	build.ps1
#	comic/migrations/0008_auto_20160331_1140.py
#	entrypoint.sh
#	frontend/package-lock.json
#	pyproject.toml
#	requirements.txt
#	uv.lock
This commit is contained in:
2026-01-14 17:01:52 +00:00
23 changed files with 3727 additions and 3837 deletions

View File

@@ -14,5 +14,6 @@
!package-lock.json
!package.json
!frontend
!uv.lock
/frontend/node_modules
/frontend/dist