Claire 5321a553d5 Merge commit 'aa04efb92a47cf27c1aafb2aeb21584e91c526ac' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/user_settings.rb`:
  Not a real conflict, upstream added a setting on a line adjacent to a
  glitch-soc-only line.
  Added upstream's new setting.

2025-05-14 13:38:23 +02:00

..

__mocks__

…

entrypoints

Merge commit '7a70d9543525681b5c408cfd17782843da13177f' into glitch-soc/merge-upstream

2025-04-25 17:22:10 +02:00

flavours

[Glitch] Fix bugs with upload progress

2025-05-09 18:16:03 +02:00

fonts

…

icons

…

images

Merge commit '7a70d9543525681b5c408cfd17782843da13177f' into glitch-soc/merge-upstream

2025-04-25 17:22:10 +02:00

mastodon

Merge commit 'aa04efb92a47cf27c1aafb2aeb21584e91c526ac' into glitch-soc/merge-upstream

2025-05-14 13:38:23 +02:00

material-icons

Merge commit '8b34daf2541c6afdb5ade19e4531373ef7b05bc0' into glitch-soc/merge-upstream

2025-05-03 18:28:25 +02:00

skins

[Glitch] Fix SASS deprecation notices

2025-03-27 21:29:33 +01:00

styles

Merge commit 'aa04efb92a47cf27c1aafb2aeb21584e91c526ac' into glitch-soc/merge-upstream

2025-05-14 13:38:23 +02:00

svg-icons

Change design of lists in web UI (#32881)

2024-11-21 16:10:04 +00:00

types

Fix emoji bundle size (#34677)

2025-05-14 06:39:05 +00:00