Claire 22e3c0e745 Merge commit '612771de465da60dbd58790adc6b1556a7fa739b' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a setting adjacent to a glitch-soc-only setting.
  Added upstream's setting while keeping ours.
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a setting adjacent to a glitch-soc-only setting.
  Added upstream's setting while keeping ours.

2025-10-17 19:00:18 +02:00

..

__mocks__

…

config

[Glitch] Adds new HTMLBlock component

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

entrypoints

Add support for displaying link previews for Admin UI (#35958)

2025-10-10 08:43:48 +00:00

flavours

[Glitch] Add keyboard shortcut info banner to the boosting preferences section

2025-10-17 18:39:19 +02:00

fonts

…

icons

…

images

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

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

mastodon

Merge commit '612771de465da60dbd58790adc6b1556a7fa739b' into glitch-soc/merge-upstream

2025-10-17 19:00:18 +02:00

material-icons

Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream

2025-09-02 19:07:51 +02:00

skins

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

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

styles

Merge commit '612771de465da60dbd58790adc6b1556a7fa739b' into glitch-soc/merge-upstream

2025-10-17 19:00:18 +02:00

svg-icons

Change design of lists in web UI (#32881)

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

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