mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-15 12:13:18 -05:00
6ee3e382df
Conflicts: - `app/javascript/packs/public.jsx`: Some of the removed dead code was split from this code in `app/javascript/core/public.js` and `app/javascript/core/settings.js`. Removed this dead code, and removed `app/javascript/core/public.js` altogether.