mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-17 08:03:53 -05: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