Merge branch 'master' into '46-implement-the-adminfrontend-api'

# Conflicts:
#   unisportomat/quiz/serializers.py

unisportomat/quiz/serializers.py

@@ -22,6 +22,7 @@ class QuestionListSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Question
+
         fields = ("id", "text", "criterion")