Merge commit '7f471e70c0' into glitch-soc/merge-upstream

Browse source

Conflicts:
- `app/views/layouts/mailer.html.haml`:
  Conflict caused by glitch-soc's theming system.
  Used glitch-soc's path for the mailer pack.

...

This commit is contained in:

Claire 2024-01-15 21:30:00 +01:00

parent 6e4d5b4736 7f471e70c0

commit 34c9f77b3e

66 changed files with 932 additions and 1834 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

app/javascript/fonts/inter/inter-variable-font-slnt-wght.woff2 Normal file

View file

Binary file not shown.