mirror of
https://github.com/glitch-soc/mastodon.git
synced 2026-03-29 11:11:11 +02:00
Conflicts: app/javascript/packs/public.js Changes made to app/javascript/packs/publics.js were applied to app/javascript/core/settings.js