Files
mastodon/app/javascript/material-icons/400-24px
Claire 02134172f1 Merge commit 'e770303968dc04d20dd5f3a5d7da3b9d7ba888fc' into glitch-soc/merge-upstream
Conflicts:
- `.rubocop_todo.yml`:
  Glitch-soc had different overrides, but upstream simply disabled the rules.
  Disabled them as well.
- `app/serializers/initial_state_serializer.rb`:
  Not really a conflict, again because of a rubocop comment.
2025-08-22 22:33:11 +02:00
..
2024-02-06 20:22:42 +01:00
2024-02-06 20:22:42 +01:00
2025-03-28 12:16:40 +00:00
2025-03-28 12:16:40 +00:00
2024-02-06 20:22:42 +01:00
2024-02-06 20:22:42 +01:00