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

2024-03-04 10:37:41 +09:00 · 2024-03-04 10:37:41 +09:00 · 42b5727723
commit 42b5727723
parent 76b24193c4 68600893d2
147 changed files with 1529 additions and 958 deletions
--- a/app/javascript/mastodon/features/account/components/header.jsx
+++ b/app/javascript/mastodon/features/account/components/header.jsx
@ -104,7 +104,6 @@ const dateFormatOptions = {
  month: 'short',
  day: 'numeric',
  year: 'numeric',
-  hour12: false,
  hour: '2-digit',
  minute: '2-digit',
 };