Claire c96eebde37 Merge commit 'ded7f50f2c2672879292ff571b2e531ea87f77e4' into glitch-soc/merge-4.5 ...

Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Upstream refactored a bit where we had an extra argument for markdown/HTML.
  Adapted upstream change.

2026-01-19 18:29:02 +01:00

..

__mocks__

…

config

[Glitch] Adds new HTMLBlock component

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

entrypoints

Emoji: Remove final flag (#36409)

2025-10-28 11:33:27 +00:00

flavours

[Glitch] Fix custom emojis not being rendered in profile fields

2026-01-06 18:14:35 +01:00

fonts

…

icons

…

images

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

2025-08-06 22:02:55 +02:00

mastodon

Merge commit 'ded7f50f2c2672879292ff571b2e531ea87f77e4' into glitch-soc/merge-4.5

2026-01-19 18:29:02 +01:00

material-icons

Merge commit '048430f4e8010672eb667f1ccf2372571cfb97dd' into glitch-soc/merge-4.5

2025-11-06 12:16:55 +01:00

skins

Merge commit '825312d4b0587c0da5575f8eaabe038438746cd3' into glitch-soc/merge-upstream

2025-06-12 20:32:25 +02:00

styles

Merge commit 'ded7f50f2c2672879292ff571b2e531ea87f77e4' into glitch-soc/merge-4.5

2026-01-19 18:29:02 +01:00

svg-icons

…

testing

Emoji: Cleanup new code (#36402)

2025-10-14 09:36:25 +00:00

types

Emoji Component (#36293)

2025-09-30 13:06:02 +00:00