setting up merge

24cf7409 · Nicolas Reichert · 0c0b19d4 · 24cf7409 · 24cf7409 · 24cf7409
Commit 24cf7409 authored May 23, 2022 by Nicolas Reichert
33 changed files
--- a/announcements/__pycache__/admin.cpython-38.pyc
+++ b/announcements/__pycache__/admin.cpython-38.pyc
--- a/announcements/__pycache__/models.cpython-38.pyc
+++ b/announcements/__pycache__/models.cpython-38.pyc
--- a/announcements/__pycache__/urls.cpython-38.pyc
+++ b/announcements/__pycache__/urls.cpython-38.pyc
--- a/announcements/__pycache__/views.cpython-38.pyc
+++ b/announcements/__pycache__/views.cpython-38.pyc
--- a/announcements/migrations/__pycache__/0002_announcement_author_reaction.cpython-38.pyc
+++ b/announcements/migrations/__pycache__/0002_announcement_author_reaction.cpython-38.pyc
--- a/announcements/migrations/__pycache__/0003_reaction_reaction_name.cpython-38.pyc
+++ b/announcements/migrations/__pycache__/0003_reaction_reaction_name.cpython-38.pyc
--- a/assignments/__pycache__/admin.cpython-38.pyc
+++ b/assignments/__pycache__/admin.cpython-38.pyc
--- a/assignments/__pycache__/models.cpython-38.pyc
+++ b/assignments/__pycache__/models.cpython-38.pyc
--- a/assignments/__pycache__/urls.cpython-38.pyc
+++ b/assignments/__pycache__/urls.cpython-38.pyc
--- a/assignments/__pycache__/views.cpython-38.pyc
+++ b/assignments/__pycache__/views.cpython-38.pyc
--- a/assignments/migrations/__pycache__/0002_course.cpython-38.pyc
+++ b/assignments/migrations/__pycache__/0002_course.cpython-38.pyc
--- a/assignments/migrations/__pycache__/0003_assignment_course.cpython-38.pyc
+++ b/assignments/migrations/__pycache__/0003_assignment_course.cpython-38.pyc
--- a/db.sqlite3
+++ b/db.sqlite3
--- a/forum/__pycache__/__init__.cpython-38.pyc
+++ b/forum/__pycache__/__init__.cpython-38.pyc
--- a/forum/__pycache__/admin.cpython-38.pyc
+++ b/forum/__pycache__/admin.cpython-38.pyc
--- a/forum/__pycache__/models.cpython-38.pyc
+++ b/forum/__pycache__/models.cpython-38.pyc
--- a/forum/__pycache__/urls.cpython-38.pyc
+++ b/forum/__pycache__/urls.cpython-38.pyc
--- a/forum/__pycache__/views.cpython-38.pyc
+++ b/forum/__pycache__/views.cpython-38.pyc
--- a/forum/migrations/__pycache__/0004_post_author_reply.cpython-38.pyc
+++ b/forum/migrations/__pycache__/0004_post_author_reply.cpython-38.pyc
--- a/forum/migrations/__pycache__/0005_alter_post_author_alter_reply_author.cpython-38.pyc
+++ b/forum/migrations/__pycache__/0005_alter_post_author_alter_reply_author.cpython-38.pyc
--- a/forum/migrations/__pycache__/0006_alter_post_author_alter_reply_author.cpython-38.pyc
+++ b/forum/migrations/__pycache__/0006_alter_post_author_alter_reply_author.cpython-38.pyc
--- a/forum/migrations/__pycache__/0007_alter_post_pub_date_alter_reply_pub_date.cpython-38.pyc
+++ b/forum/migrations/__pycache__/0007_alter_post_pub_date_alter_reply_pub_date.cpython-38.pyc
--- a/forum/migrations/__pycache__/0008_reply_post_alter_post_pub_date_alter_reply_pub_date.cpython-38.pyc
+++ b/forum/migrations/__pycache__/0008_reply_post_alter_post_pub_date_alter_reply_pub_date.cpython-38.pyc
--- a/forum/migrations/__pycache__/0009_alter_post_pub_date_alter_reply_pub_date.cpython-38.pyc
+++ b/forum/migrations/__pycache__/0009_alter_post_pub_date_alter_reply_pub_date.cpython-38.pyc
--- a/forum/migrations/__pycache__/0010_alter_post_pub_date_alter_reply_pub_date.cpython-38.pyc
+++ b/forum/migrations/__pycache__/0010_alter_post_pub_date_alter_reply_pub_date.cpython-38.pyc
--- a/homepage/__pycache__/admin.cpython-38.pyc
+++ b/homepage/__pycache__/admin.cpython-38.pyc
--- a/homepage/__pycache__/models.cpython-38.pyc
+++ b/homepage/__pycache__/models.cpython-38.pyc
--- a/homepage/__pycache__/views.cpython-38.pyc
+++ b/homepage/__pycache__/views.cpython-38.pyc
--- a/homepage/migrations/__pycache__/0001_initial.cpython-38.pyc
+++ b/homepage/migrations/__pycache__/0001_initial.cpython-38.pyc
--- a/homepage/migrations/__pycache__/0002_department_widgetuser_email_widgetuser_id_num.cpython-38.pyc
+++ b/homepage/migrations/__pycache__/0002_department_widgetuser_email_widgetuser_id_num.cpython-38.pyc
--- a/homepage/migrations/__pycache__/0003_widgetuser_department.cpython-38.pyc
+++ b/homepage/migrations/__pycache__/0003_widgetuser_department.cpython-38.pyc
--- a/widget_group_23/__pycache__/settings.cpython-38.pyc
+++ b/widget_group_23/__pycache__/settings.cpython-38.pyc
--- a/widget_group_23/__pycache__/urls.cpython-38.pyc
+++ b/widget_group_23/__pycache__/urls.cpython-38.pyc