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

2024-08-13 07:01:38 +09:00 · 2024-08-13 07:01:38 +09:00 · e7ccc0539f
commit e7ccc0539f
parent b787b130a2 b42661ba95
358 changed files with 4653 additions and 4261 deletions
--- a/lib/sanitize_ext/sanitize_config.rb
+++ b/lib/sanitize_ext/sanitize_config.rb
@ -88,7 +88,7 @@ class Sanitize
    end

    MASTODON_STRICT = freeze_config(
-      elements: %w(p br span a del pre blockquote code b strong u i em ul ol li ruby rt rp),
+      elements: %w(p br span a del s pre blockquote code b strong u i em ul ol li ruby rt rp),

      attributes: {
        'a' => %w(href rel class translate),