Merge commit '9974163776b3e65e7cfa41e6293876909a1635b7' into glitch-soc/merge-upstream

Browse source

Conflicts:
- `app/views/layouts/admin.html.haml`:
  Upstream moved `javascript_pack_tag` calls around, but we don't use them in
  the same way in glitch-soc due to the different theming system.
  Kept glitch-soc's files unchanged.

...

This commit is contained in:

Claire 2023-08-24 21:52:19 +02:00

parent 406f3942a9 9974163776

commit 80f89f9cf2

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

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

Diff content is not available