Merge commit '5e0894ff132ef566880604b96b45ce650a9872ab' 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.

lolsob-rspec

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

parent 6f5721e5c9 5e0894ff13

commit 8ed2ece44d

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 Not Available