Claire bd9e7d6060 Merge commit '68984de5b503791b814d81a85520af256bf43e11' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/admin/settings/discovery/show.html.haml`:
  Glitch-soc has an extra setting textually adjacent to a line upstream has changed.
  Applied upstream's change while keeping glitch-soc's setting.

2026-03-17 18:53:00 +01:00

..

entrypoints

Display quotes in email notifications (#36379)

2025-10-07 12:50:40 +00:00

fonts

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

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

mastodon

Merge commit '68984de5b503791b814d81a85520af256bf43e11' into glitch-soc/merge-upstream

2026-03-17 18:53:00 +01:00

application.scss

Fix inversion of emoji colours based on dark/light mode (#37120)

2025-12-05 10:08:59 +00:00

common.scss

Update Wrapstodon design (#37169)

2025-12-09 16:51:05 +00:00