Merge branch 'master' into '76-die-lange-der-zeit-pro-frage-anpassen'

# Conflicts: # django/library/forms.py
2025-04-18 11:00:52 +00:00
parent e269264f03 70be6396aa
commit ffe636c6c7
26 changed files with 804 additions and 52 deletions
--- a/django/library/forms.py
+++ b/django/library/forms.py
@@ -4,7 +4,7 @@ from .models import QivipQuiz, QivipQuestion
 class QuizForm(forms.ModelForm):
    class Meta:
        model = QivipQuiz
-        fields = ['name', 'description','image', 'status', 'category', 'tags','difficulty','credits']
+        fields = ['name', 'description','image', 'status', 'category','difficulty','credits']

 class QuestionForm(forms.ModelForm):
    class Meta: