Claire 7839c8d9af Merge commit 'cc3c7ba532f75617505bb41297651a5c14f71bdd' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream simplified `theme_style_tags`. Our version is different because of
  the different theming system.
  Adapted upstream's changes.
- `app/views/layouts/error.html.haml`:
  Theming system.

2026-01-16 23:22:19 +01:00

..

__mocks__

…

config

…

entrypoints

Fix error pages not using the new theming infrastructure (#37524)

2026-01-16 14:44:58 +00:00

flavours

[Glitch] Fix directory showing load more button when no more profiles exist

2026-01-16 22:31:54 +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

inline

Enable theming via new HTML element attributes (#37477)

2026-01-15 16:04:27 +00:00

mastodon

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

2026-01-16 23:22:19 +01:00

material-icons

…

skins

Remove unmaintained win95 theme

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

styles

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

2026-01-16 23:22:19 +01:00

svg-icons

…

testing

Emoji: Adds search (#37418)

2026-01-09 10:37:14 +00:00

types

…