Files
mastodon/app/models
Claire 84feffd6e6 Merge commit '009275e66b55729f754da7b4c814b37b67dc76dc' into glitch-soc/merge-upstream
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream added a method right next to glitch-soc-only methods.
  Added upstream's method.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream changed a line right next to a glitch-soc addition.
  Changed the code as upstream did.
2025-12-17 18:27:14 +01:00
..
2025-12-09 16:09:01 +00:00
2023-04-09 11:25:30 +02:00
2025-10-21 15:00:28 +02:00