Merge branch 'remove_data' into empty_app

# Conflicts:
#	README.md

apps/calendar/migrations/0008_enrollmentoption_empty_enrollment.py

+# Generated by Django 3.2.5 on 2023-09-18 15:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('calendar', '0007_alter_event_debt_collection'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='enrollmentoption',
+            name='empty_enrollment',
+            field=models.BooleanField(default=False),
+        ),
+    ]

apps/calendar/migrations/0009_auto_20230918_1547.py

+# Generated by Django 3.2.5 on 2023-09-18 15:47
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('MySU', '0050_banner'),
+        ('calendar', '0008_enrollmentoption_empty_enrollment'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='enrollmentoption',
+            name='association',
+            field=models.ForeignKey(blank=True, on_delete=django.db.models.deletion.PROTECT, related_name='enrollment_options', to='MySU.association'),
+        ),
+        migrations.AlterField(
+            model_name='enrollmentoption',
+            name='event',
+            field=models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='enrollment_options', to='calendar.event'),
+        ),
+    ]

apps/calendar/migrations/0010_event_image.py

+# Generated by Django 3.2.5 on 2023-09-18 16:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('calendar', '0009_auto_20230918_1547'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='event',
+            name='image',
+            field=models.ImageField(blank=True, upload_to='association/event'),
+        ),
+    ]

apps/calendar/migrations/0011_auto_20230918_1613.py

+# Generated by Django 3.2.5 on 2023-09-18 16:13
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('MySU', '0050_banner'),
+        ('calendar', '0010_event_image'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='enrollmentoption',
+            name='association',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='enrollment_options', to='MySU.association'),
+        ),
+        migrations.AlterField(
+            model_name='enrollmentoption',
+            name='event',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='enrollment_options', to='calendar.event'),
+        ),
+    ]