Merge commit '3dcf5e12b1ffb8e57a7c1e1f3f1145c9bae477e8' into glitch-soc/merge-upstream

Browse Source

Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict because one of the removed lines was modified to accomodate for
  glitch-soc's slightly different build system.
  Removed the lines as upstream did.

...

This commit is contained in:

Claire committed 2025-01-21 19:23:25 +01:00

2 parents b0bf355911 3dcf5e12b1

commit 05e5db91c7

44 files changed

+939 -908

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

No files matched your search

app/javascript/images/reticle.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.4 KiB