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/1faf3-1f3fe.svg b/public/emoji/1faf3-1f3fe.svg
new file mode 100755
index 000000000..081e709cf
--- /dev/null
+++ b/public/emoji/1faf3-1f3fe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#90603E" d="M17.554 24.8a2 2 0 0 1-1.791-1.106c-1.162-2.324-3.655-4.978-5.411-6.294a2 2 0 1 1 2.401-3.2c2.107 1.581 5.068 4.667 6.589 7.706a1.999 1.999 0 0 1-1.788 2.894z"/><path fill="#AF7E57" d="M18.002 24a2 2 0 0 1-1.791-1.106c-1.162-2.324-3.655-4.978-5.411-6.294a2 2 0 1 1 2.401-3.2c2.107 1.581 5.068 4.667 6.589 7.706A1.999 1.999 0 0 1 18.002 24z"/><path fill="#90603E" d="M23.554 26.8a2 2 0 0 1-1.717-.972c-2.109-3.515-4.404-5.799-9.447-9.401a2.001 2.001 0 0 1 2.324-3.255c5.487 3.919 8.15 6.593 10.553 10.599a2 2 0 0 1-1.713 3.029z"/><path fill="#AF7E57" d="M24.002 26a2 2 0 0 1-1.717-.972c-2.109-3.515-4.404-5.799-9.447-9.401a2.001 2.001 0 0 1 2.324-3.255c5.487 3.919 8.15 6.593 10.553 10.599A2 2 0 0 1 24.002 26z"/><path fill="#90603E" d="M29.552 26.299a1.992 1.992 0 0 1-1.414-.586c-2.758-2.757-5.871-5.303-10.748-8.787a2 2 0 0 1 2.324-3.255c5.068 3.621 8.329 6.29 11.252 9.213a2 2 0 0 1-1.414 3.415z"/><path fill="#AF7E57" d="M30 25.5a1.992 1.992 0 0 1-1.414-.586c-2.758-2.757-5.871-5.303-10.748-8.787a2 2 0 0 1 2.324-3.255c5.068 3.621 8.329 6.29 11.252 9.213A2 2 0 0 1 30 25.5z"/><path fill="#90603E" d="m13.734 25.75-1.175-2.08a2.252 2.252 0 0 1-.18-1.832L0 10.135v9.518l.278.069a9.564 9.564 0 0 1 5.028 3.156l5.329 6.473 1.071 2.931c.101.337.435.617.858.704 1.354.246 2.819-.394 3.081-1.368.384-1.959-.664-4.057-1.911-5.868z"/><path fill="#AF7E57" d="m0 7.932 5.215 2.235c1.182.506 2.439.812 3.722.903l9.516.68c1.678.12 3.309.605 4.78 1.422l5.027 2.793a11.542 11.542 0 0 0 3.705 1.295l2.226.371a2.166 2.166 0 0 1-.356 4.302c-2.527 0-5.025-.541-7.325-1.587l-2.873-1.306a11.534 11.534 0 0 0-9.316-.101 2.247 2.247 0 0 0-1.067 3.185l1.183 2.07a8.425 8.425 0 0 1 .946 5.832 1.945 1.945 0 0 1-2.371 1.507c-.331-.081-.583-.355-.677-.682l-.835-2.919-5.501-6.602a9.564 9.564 0 0 0-5.028-3.156L0 17.932v-10z"/><path fill="#90603E" d="M33.834 21.932c-2.527 0-5.025-.541-7.325-1.587l-2.873-1.306a11.534 11.534 0 0 0-9.316-.101 2.247 2.247 0 0 0-1.069.963l.006-.003a11.534 11.534 0 0 1 9.316.101l2.874 1.306a17.695 17.695 0 0 0 7.325 1.587c.816 0 1.519-.457 1.888-1.124a2.18 2.18 0 0 1-.826.164z"/></svg>
\ No newline at end of file