Files
mastodon/app/models
Claire d5b959a2ca Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some preferences to a new category, while glitch-soc had an
  extra preference there.
  Moved the extra preference like upstream did to the new category.
2025-09-02 19:07:51 +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