mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-12 13:43:50 -05:00
Conflicts: - `.prettierignore`: Conflict due to glitch-soc-only files. Kept those at the end of the file.
Conflicts: - `.prettierignore`: Conflict due to glitch-soc-only files. Kept those at the end of the file.