Claire b3bae7e78f Merge commit '3473b8a65278783bc74ce2738aea98cca0c7a5ed' into glitch-soc/merge-upstream ...

Conflicts:
- `config/settings.yml`:
  Upstream added a new setting textually adjacent to ones modified by glitch-soc's.
  Added upstream's new setting.

2026-04-25 09:20:39 +02:00

..

entrypoints

Add email subscriptions (#38163)

2026-03-25 16:25:45 +00:00

fonts

Use @/ absolute paths instead of relative paths in CSS (#34806)

2025-05-26 07:27:44 +00:00

mastodon

Merge commit '3473b8a65278783bc74ce2738aea98cca0c7a5ed' into glitch-soc/merge-upstream

2026-04-25 09:20:39 +02:00

application.scss

Remove superfluous SCSS imports file (#38261)

2026-03-17 17:39:21 +00:00