Claire 1fdb48c668 Merge commit 'cbe135210305c0ce4455130c4e75680e53ff1425' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/wrapstodon/show.html.haml`:
  Conflict caused by glitch-soc's theming system.
  Updated upstream changes.

2025-12-15 20:22:20 +01:00

..

__mocks__

…

config

[Glitch] Adds new HTMLBlock component

2025-09-27 22:05:42 +02:00

entrypoints

Fixes display names not rendering with emojis (#37251)

2025-12-15 12:54:46 +00:00

flavours

[Glitch] Fix wrapstodon not falling back to username when display name is not set

2025-12-12 17:59:53 +01:00

fonts

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

2025-12-10 18:05:44 +01:00

icons

…

images

Merge commit '4af8e83c8a236265c46a1b984fa5dbd3a7c73dfe' into glitch-soc/merge-upstream

2025-12-12 17:45:26 +01:00

mastodon

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

2025-12-15 20:22:20 +01:00

material-icons

Merge commit '58b3fc03796dbde54dbba9a4c554c2d8d24f81fd' into glitch-soc/merge-upstream

2025-11-06 12:35:04 +01:00

skins

Remove unmaintained win95 theme

2025-12-02 21:06:16 +01:00

styles

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

2025-12-15 20:22:20 +01:00

svg-icons

…

testing

Emoji: Import and use shortcode data (#37178)

2025-12-15 15:38:13 +00:00

types

Refactor carousel components (#36425)

2025-10-29 14:44:46 +00:00