mirror of
https://github.com/funamitech/mastodon
synced 2024-11-23 22:57:05 +09:00
83480df820
Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Upstream added `<s>` to the list of allowed tags, the conflict is because we have a different list of allowed tags. Added `<s>` like upstream did. |
||
---|---|---|
.. | ||
sanitize_config.rb |