Merge remote-tracking branch 'parent/main' into upstream-20241026

2024-10-26 10:41:00 +09:00 · 2024-10-26 10:41:00 +09:00 · 0c99b8fbb0
commit 0c99b8fbb0
parent d3d528d595 77cd16f4ee
79 changed files with 2403 additions and 2056 deletions
--- a/app/javascript/mastodon/components/short_number.tsx
+++ b/app/javascript/mastodon/components/short_number.tsx
@ -1,4 +1,5 @@
 import { memo } from 'react';
+import type { JSX } from 'react';

 import { FormattedMessage, FormattedNumber } from 'react-intl';