Files
mastodon/app/models
Claire 705ea99136 Merge commit '624c024766227255c78d31bd408876c64a8b279f' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream added an optional keyword argument where glitch-soc already had one for content-type.
  Added upstream's new option while keeping glitch-soc's.
2025-09-03 14:39:57 +02:00
..
2023-04-09 11:25:30 +02:00
2025-08-26 15:51:56 +00:00
2025-07-28 08:54:29 +00:00