sMerge branch 'zorn-dev'

This commit is contained in:
2024-12-28 13:50:12 +09:00
17 changed files with 130 additions and 116 deletions

View File

@@ -1,4 +1,8 @@
<<<<<<< HEAD
# Generated by Django 5.1.4 on 2024-12-25 07:00
=======
# Generated by Django 5.1.4 on 2024-12-28 00:49
>>>>>>> zorn-dev
from django.db import migrations