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/1fab8.svg b/public/emoji/1fab8.svg
new file mode 100755
index 000000000..2e458cff2
--- /dev/null
+++ b/public/emoji/1fab8.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#FA743E" d="M31.121 12.536c-1.591-1.187-3.384 1.22-1.792 2.405.496.37 1.058.958 1.185 1.234-.049.889-2.39 1.13-4.051 2.701-.804-1.109-1.687-1.704-1.755-1.748-1.661-1.083-3.302 1.428-1.639 2.513 1.002.659 1.802 2.047 1.71 3.61.005 2.706-.729 3.352-2.915 4.448-1.121.562-2.518 1.287-3.258 2.759-.066-2.758 5.868-4.612 1.159-9.907-1.32-1.482-3.561.511-2.241 1.994.672.755 1.042 1.401 1.042 1.819 0 1.055-2.543 2.502-2.916 5.21l-.059-.052c-.112-.134-.181-.196-.589-.51-2.495-2.029-1.641-3.959-.439-6.956 1.532-3.789 2.932-5.523 4.193-7.417.651-.674.382-.781 2.615-1.816 2.28-1.056 3.878-2.147 3.771-4.844l-2.997.123c.02.69.089 1.013-2.009 1.987-.336-2.388-2.479-2.571-2.884-3.66-.272-.734 1.252-1.645 2.64-2.202 1.836-.737.73-3.523-1.117-2.784-5.706 2.29-5.616 6.147-2.259 8.435.665.454.665.492.665.79 0 1.569-1.354 2.622-3.232 5.824-1.084-1.914-2.676-3.6-3.124-4.055-1.388-1.414-3.53.684-2.141 2.102 1.337 1.364 3.315 3.957 3.315 5.191 0 1.936-1.844 3.591-1.567 6.773-4.283-2.055-3.76-2.963-3.76-5.93 0-2.444-1.548-3.697-1.725-3.832-1.513-1.154-3.34 1.086-1.85 2.361.687.587.578 1.654.552 2.308-.36 9.252 10.816 6.963 11.354 13.208a1.5 1.5 0 0 0 1.495 1.371c3.184 0 3.637.137 4.168-.514.285-.349.403-.77.313-1.211-.01-.145.035-.601.056-.82.165-1.682-.18-1.882 2.172-3.062 3.092-1.551 4.577-3.177 4.57-7.129 0-2.083.994-2.537 2.5-3.224 1.289-.588 3.236-1.478 3.236-3.931.003-1.606-1.672-3.026-2.392-3.562z"/><path d="M2.846 18.409a.526.526 0 0 1-.721-.493 1.914 1.914 0 0 1 3.271-1.335.539.539 0 0 1-.183.882l-2.367.946zm7.895-5.769a.541.541 0 0 0-.114-.894 1.915 1.915 0 0 0-2.66 2.323.527.527 0 0 0 .842.232l1.932-1.661zm9.523-8.81a.543.543 0 0 0 .889-.15 1.913 1.913 0 0 0-2.431-2.562.526.526 0 0 0-.198.851l1.74 1.861zm4.617 4.194a.54.54 0 0 0 .486-.758 1.914 1.914 0 0 0-3.532.074.526.526 0 0 0 .497.719l2.549-.035zm6.206 4.741a.54.54 0 0 0-.234-.87 1.916 1.916 0 0 0-2.321 2.662.525.525 0 0 0 .866.116l1.689-1.908zm-6.244 4.772a.538.538 0 0 0-.128-.891 1.916 1.916 0 0 0-2.623 2.366.527.527 0 0 0 .846.219l1.905-1.694zm-5.181 3.193a.541.541 0 0 0-.085-.897 1.915 1.915 0 0 0-2.735 2.235.525.525 0 0 0 .834.259l1.986-1.597z" fill="#FBBEA9"/><path d="M31.926 23.057c.805-.063.635 1.016.843 1.716.372 1.25 1.1 1.627-.799 3.569-1.104 1.129-1.795-.738-1.461-2.585.304-1.682.603-2.636 1.417-2.7zm-30.088-12.1c-.188.641.106 1.344.771 1.258.753-.096.689-2.325-.026-2.239-.352.043-.585.437-.745.981zM4 3.197a2 2 0 0 0-2 2c-.002 1.116.856 2.629 1.979 2.773 1.131.14 2.005-1.573 2.017-2.739C5.999 4.092 5.104 3.197 4 3.197zm.801 5.404c-.309-.005-.545.286-.528.653s.28.669.589.677c.308.007.545-.284.528-.653-.016-.369-.28-.671-.589-.677zM29.873 30.1c-.309-.006-.552.3-.54.681.012.381.273.688.583.695.309.007.549-.289.537-.67-.013-.382-.271-.7-.58-.706zm4.798-9.054c-.338-.034-.661.409-.729.965-.068.556.152 1.002.484 1.043.332.042.666-.337.742-.9s-.159-1.074-.497-1.108zM7.731 1.389c-.259-.168-.614-.046-.794.274-.18.32-.117.716.141.886.258.17.613.048.794-.274s.118-.718-.141-.886z" fill="#A8E0F9"/><g fill="#FFF"><ellipse transform="rotate(-30.952 3.582 4.586)" cx="3.582" cy="4.586" rx="1.178" ry=".742"/><ellipse transform="rotate(-86.503 31.668 24.499)" cx="31.667" cy="24.498" rx=".744" ry=".468"/></g></svg>
\ No newline at end of file