Merge branch 'main' into glitch-soc/merge-upstream

Browse Source

Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.

...

This commit is contained in:

Claire

2022-11-06 09:50:41 +01:00

parent 2f8fb49d13 5187e4e758

commit 0ad919b192

503 changed files with 8593 additions and 4058 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

spec/fixtures/files/emojo.png vendored

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 29 KiB After Width:  |  Height:  |  Size: 29 KiB