mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-19 14:12:54 -05:00
a3b6a85521
Conflicts: - `.prettierignore`: Conflict due to glitch-soc-only files. Kept those at the end of the file.