Merge remote-tracking branch 'parent/main' into kb-upstream-20231026

2023-10-26 20:24:34 +09:00 · 2023-10-26 20:24:34 +09:00 · 5448bcf276
commit 5448bcf276
parent 551a9e8216 49b8433c56
313 changed files with 3717 additions and 4735 deletions
--- a/app/views/admin/statuses/index.html.haml
+++ b/app/views/admin/statuses/index.html.haml
@ -1,7 +1,7 @@
 - content_for :page_title do
  = t('admin.statuses.title')
  \-
-  = "@#{@account.pretty_acct}"
+  @#{@account.pretty_acct}

 .filters
  .filter-subset