Files
mastodon/app
Claire f7b4580b49 Merge commit '0d650780e26735621f08bbdd545b162871e4562c' into glitch-soc/merge-upstream
Conflicts:
- `.prettierignore`:
  Upstream added a file, glitch-soc had extra files.
  Took upstream's changes and moved glitch-soc's additions at the end.
2025-06-26 18:04:37 +02:00
..