Merge remote-tracking branch 'parent/main' into kb_migration

2023-09-03 10:55:46 +09:00 · 2023-09-03 10:55:46 +09:00 · 32cfd20257
commit 32cfd20257
parent 0e0e9e383b 728eb6a153
54 changed files with 1045 additions and 138 deletions
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@ -103,6 +103,7 @@ code {
        }
      }

+      .overridden,
      .recommended,
      .not_recommended,
      .kmyblue {