mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-05 22:43:06 -05:00
Conflicts: app/javascript/mastodon/features/getting_started/index.js app/javascript/packs/public.js app/javascript/styles/components.scss