Claire 84feffd6e6 Merge commit '009275e66b55729f754da7b4c814b37b67dc76dc' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream added a method right next to glitch-soc-only methods.
  Added upstream's method.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream changed a line right next to a glitch-soc addition.
  Changed the code as upstream did.

2025-12-17 18:27:14 +01:00

..

__mocks__

Change icon SVG imports to use a default import (#28709)

2024-01-12 10:31:24 +00:00

config

[Glitch] Adds new HTMLBlock component

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

entrypoints

Updates Wrapstodon footer with dedicated local server info (#37270)

2025-12-16 15:35:26 +00:00

flavours

[Glitch] Updates Wrapstodon footer with dedicated local server info

2025-12-16 18:37:45 +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 '009275e66b55729f754da7b4c814b37b67dc76dc' into glitch-soc/merge-upstream

2025-12-17 18:27:14 +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 '53be8392eceea8c3a576478e209fe82c2ceb458a' into glitch-soc/merge-upstream

2025-12-16 18:27:03 +01:00

svg-icons

Change design of lists in web UI (#32881)

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

testing

Remove rendering of custom emoji using the database (#37284)

2025-12-17 14:40:34 +00:00

types

Refactor carousel components (#36425)

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