mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-06 06:52:48 -05:00
Conflicts: - `app/javascript/packs/public.js`: Upstream modified code that we split between multiple files due to glitch-soc's theming system. Ported those changes.