mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-14 16:28:59 +00:00
Conflicts: - `.prettierignore`: Upstream added a file, glitch-soc had extra files. Took upstream's changes and moved glitch-soc's additions at the end.