mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-18 00:23:51 -05:00
Conflicts: - `app/javascript/packs/public.jsx`: Upstream refactored slightly (but touching almost all the lines in the code), glitch-soc had moved a few of the code to another file. Refactored as upstream did.