Merge branch '1161-save-empty' into 'master'

Resolve "Gunicorn django.request ERROR to settings/bulk/"

See merge request funkwhale/funkwhale!1147

api/funkwhale_api/common/serializers.py

@@ -320,7 +320,9 @@ class AttachmentSerializer(serializers.Serializer):
 
 
 class ContentSerializer(serializers.Serializer):
-    text = serializers.CharField(max_length=models.CONTENT_TEXT_MAX_LENGTH)
+    text = serializers.CharField(
+        max_length=models.CONTENT_TEXT_MAX_LENGTH, allow_null=True
+    )
     content_type = serializers.ChoiceField(choices=models.CONTENT_TEXT_SUPPORTED_TYPES,)
     html = serializers.SerializerMethodField()
 

changes/changelog.d/1161.bugfix

@@ -0,0 +1 @@
+Fixed crash with null help text in admin (#1161)