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.

local

Claire 9 months ago

parent 406f3942a9 9974163776

commit 80f89f9cf2

Whitespace

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

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available