mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-03-27 13:50:45 -04:00
Conflicts: - app/lib/sanitize_config.rb Keep our version, we support the tags upstream transforms. - package.json - yarn.lock
Conflicts: - app/lib/sanitize_config.rb Keep our version, we support the tags upstream transforms. - package.json - yarn.lock