Merge remote-tracking branch 'origin/master' into test/custom-admin-ui
# Conflicts: # .gitignore # Dockerfile # apps/admin/services.py # apps/admin/views.py # apps/base/models.py # apps/base/views.py # core/settings.py
This commit is contained in:
+1
-1
@@ -107,4 +107,4 @@ upload_chunk_pydantic = pydantic_model_creator(UploadChunk, name="UploadChunk")
|
||||
key_value_pydantic = pydantic_model_creator(KeyValue, name="KeyValue")
|
||||
presign_upload_session_pydantic = pydantic_model_creator(
|
||||
PresignUploadSession, name="PresignUploadSession"
|
||||
)
|
||||
)
|
||||
Reference in New Issue
Block a user