Merge branch 'develop' into future-2024-05-31

2024-06-08 16:45:53 +01:00
parent c39de769ca 1063102186
commit 5dc8c2827c
32 changed files with 415 additions and 222 deletions
@@ -302,5 +302,10 @@ checkActivityPubGetSignature: false
 # Upload or download file size limits (bytes)
 #maxFileSize: 262144000

+# timeout and maximum size for imports (e.g. note imports)
+#import:
+#  downloadTimeout: 30
+#  maxFileSize: 262144000
+
 # PID File of master process
 #pidFile: /tmp/misskey.pid