Claire 17ba99e5de Merge commit 'd6f2a3ac8d61e0828a17f68a6e9094d0f4662f4c' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/wrapstodon/show.html.haml`:
  Conflict because of glitch-soc's theming change.
  Adapted upstream's changes.
- `docker-compose.yml`:
  Conflict because of container repo name change.
  Adapted upstream's changes.
- `yarn.lock`:
  Conflict because of an additional glitch-soc dependency.
  Updated the dependencies upstream did.

2025-12-10 18:05:44 +01:00

..

inter

Update new email templates (#28416)

2024-01-15 18:18:59 +00:00

premillenium

Theme: Windows 95

2017-10-26 23:22:48 -07:00

roboto

Fix local fonts and change font-face values (#2877)

2017-05-07 15:23:06 +02:00

roboto-mono

Fix local fonts and change font-face values (#2877)

2017-05-07 15:23:06 +02:00

silkscreen-wrapstodon

Implement custom font for Wrapstodon heading (#37193)

2025-12-10 16:26:46 +00:00