Merge branch 'refs/heads/develop' into feature/channel_muting

# Conflicts: # packages/backend/test/e2e/timelines.ts
2024-07-03 07:16:44 +09:00 · 2024-07-03 07:16:44 +09:00 · 81d883c45f
commit 81d883c45f
parent 3514c9f68c 5d03efa1bb
75 changed files with 5692 additions and 4609 deletions
--- a/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts
+++ b/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts
@ -61,7 +61,7 @@ export const meta = {
 			name: {
 				type: 'string',
 				optional: false, nullable: false,
-				example: 'lenna.jpg',
+				example: '192.jpg',
 			},
 			type: {
 				type: 'string',