merge: 合并V2到master

# Conflicts:
#	.gitignore
#	README.md
#	config/asgi.py
#	config/settings.py
#	config/urls.py
#	config/wsgi.py
#	manage.py
#	requirements.txt
#	templates/base.html
#	tests/conftest.py
This commit is contained in:
2026-06-11 00:08:00 +08:00
278 changed files with 45245 additions and 647 deletions

2
.gitignore vendored
View File

@@ -30,8 +30,8 @@ staticfiles/
.pytest_cache/
.coverage
htmlcov/
.tmp/
# OS
.DS_Store
Thumbs.db