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

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.

1 files changed, 1 insertions, 0 deletions

diff --git a/public/emoji/1faf4.svg b/public/emoji/1faf4.svg
new file mode 100755
index 000000000..168c190e2
--- /dev/null
+++ b/public/emoji/1faf4.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#FFDC5D" d="M17.368 16.446a2 2 0 0 0-1.791 1.106c-1.162 2.324-3.655 4.978-5.411 6.294a2 2 0 1 0 2.401 3.2c2.107-1.581 5.068-4.667 6.589-7.706a1.999 1.999 0 0 0-1.788-2.894z"/><path fill="#EF9645" d="M12.457 26.852c1.987-1.2 4.73-3.868 6.695-7.499a2.002 2.002 0 0 0-.403-2.339c-1.498 1.925-3.465 4.143-5.695 3.245.154-.401.258-.505 1.13-2.129.923-1.858 1.138-4.198.725-6.204-1.884 3.08-4.369 2.655-5.091 13.049.658 2.227 1.819 2.554 2.639 1.877z"/><path fill="#FFDC5D" d="M23.368 14.446a2 2 0 0 0-1.717.972c-2.109 3.515-4.404 5.799-9.447 9.401a2.001 2.001 0 0 0 2.324 3.255c5.487-3.919 8.15-6.593 10.553-10.599a2 2 0 0 0-1.713-3.029z"/><path fill="#EF9645" d="M25.084 17.476a2.01 2.01 0 0 0 .226-1.492c-2.215 2.453-4.94 6.839-9.949 5.224-1.121-.024-2.07.449-2.518 1.203-.366.614-.178 1.386.588 2.583 6.55-.075 9.496-2.659 11.653-7.518z"/><path fill="#FFDC5D" d="M29.888 14.946c-.512 0-1.023.195-1.414.586-2.758 2.757-5.871 5.303-10.748 8.787a2 2 0 0 0 2.324 3.255c5.068-3.621 8.329-6.29 11.252-9.213a2 2 0 0 0-1.414-3.415z"/><path fill="#EF9645" d="M31.873 17.112c-2.105.202-4.15.739-6.096 1.624l-1.718.781c-1.771 1.457-3.814 3.004-6.332 4.802a2 2 0 0 0 2.324 3.255c5.068-3.621 8.329-6.29 11.252-9.213.348-.349.532-.794.57-1.249z"/><path fill="#FFDC5D" d="M35.366 20.68c0-1.196-.97-2.165-2.166-2.165-2.527 0-5.025.541-7.325 1.587l-2.873 1.306a11.534 11.534 0 0 1-9.316.101 2.247 2.247 0 0 1-1.067-3.185l1.183-2.07a8.425 8.425 0 0 0 .946-5.832 1.945 1.945 0 0 0-2.371-1.507c-.331.081-.583.355-.677.682l-.834 2.918-5.501 6.601a9.564 9.564 0 0 1-5.028 3.156L0 22.356v9.887l1.076.369s6.601-2.49 7.884-2.581l9.558-.698c1.678-.12 10.186-4.674 10.186-4.674 1.152-.64 6.837-1.244 6.837-2.302 0-.605-.175-1.723-.175-1.677z"/><path fill="#EF9645" d="M35.352 20.546c.003.045.013.088.013.134a2.165 2.165 0 0 1-1.81 2.136l-2.226.371c-1.3.217-2.553.655-3.705 1.295l-5.027 2.793a11.534 11.534 0 0 1-4.78 1.422l-9.516.68a11.56 11.56 0 0 0-3.722.903L0 32.243v1.68l5.215-2.235a11.528 11.528 0 0 1 3.722-.903l9.516-.68a11.538 11.538 0 0 0 4.78-1.422l5.027-2.793a11.542 11.542 0 0 1 3.705-1.295l2.226-.371a2.165 2.165 0 0 0 1.161-3.678z"/></svg>
\ No newline at end of file