mirror of
https://github.com/funamitech/mastodon
synced 2024-12-18 16:48:37 +09:00
4113fbf6e8
Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Upstream enforced new code style rules, where we had different code. Applied the new code style rules. |
||
---|---|---|
.. | ||
sanitize_config.rb |