Claire f01605c665 Merge commit '3389c41b5899c1da479bfc08e84588184e09902d' into glitch-soc/merge-upstream ...

Conflicts:
- `app/javascript/packs/admin.tsx`:
  Changes applied to `app/javascript/core/admin.ts` instead.

2024-03-01 13:02:59 +01:00

..

__mocks__

…

core

Merge commit '3389c41b5899c1da479bfc08e84588184e09902d' into glitch-soc/merge-upstream

2024-03-01 13:02:59 +01:00

flavours

Merge commit '958a810553aac6b6cf21d9d107a47b6f68b2a401' into glitch-soc/merge-upstream

2024-02-29 19:02:31 +01:00

fonts

…

hooks

…

icons

…

images

Merge commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer

2024-02-22 20:58:41 +01:00

mastodon

Merge commit '6dfe318f34d69066dc0f453a228fdfc6af84b62e' into glitch-soc/merge-upstream

2024-02-29 18:24:47 +01:00

material-icons

[Glitch] Fix pixel alignment for some composer icons

2024-02-24 15:53:42 +01:00

packs

Fix regression in handling select elements in packs/admin.tsx (#29469)

2024-03-01 10:16:35 +00:00

skins

…

styles

Merge commit '6dfe318f34d69066dc0f453a228fdfc6af84b62e' into glitch-soc/merge-upstream

2024-02-29 18:24:47 +01:00

svg-icons

Use active variants for boost icons and increase icon size (#27924)

2024-01-24 12:37:43 +00:00

types

…