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

2024-08-22 09:18:29 +09:00 · 2024-08-22 09:18:29 +09:00 · 55f11765ea
commit 55f11765ea
parent 36142dfa05 2da687a28b
34 changed files with 401 additions and 601 deletions
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@ -942,10 +942,6 @@ code {
          font-weight: 700;
        }
      }
-
-      .fa {
-        font-weight: 400;
-      }
    }
  }
 }