Files
mastodon-sakyey/app/javascript/mastodon
Claire 22e3c0e745 Merge commit '612771de465da60dbd58790adc6b1556a7fa739b' into glitch-soc/merge-upstream
Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a setting adjacent to a glitch-soc-only setting.
  Added upstream's setting while keeping ours.
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a setting adjacent to a glitch-soc-only setting.
  Added upstream's setting while keeping ours.
2025-10-17 19:00:18 +02:00
..
2025-10-08 15:07:01 +00:00
2025-10-08 11:11:25 +00:00
2025-08-18 16:52:28 +00:00
2025-10-08 11:11:25 +00:00
2025-07-31 17:30:14 +00:00
2024-04-03 18:05:39 +00:00