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/1f6de.svg b/public/emoji/1f6de.svg
new file mode 100755
index 000000000..aed6c490d
--- /dev/null
+++ b/public/emoji/1f6de.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><circle fill="#191919" cx="18" cy="18" r="18"/><circle fill="#313131" cx="18" cy="18" r="17"/><circle fill="#AEB3B2" cx="18" cy="18" r="13"/><circle fill="#313131" cx="18" cy="18" r="11"/><circle fill="#787878" cx="18" cy="18" r="9"/><circle fill="#313131" cx="18" cy="18" r="6"/><circle fill="#AEB3B2" cx="18" cy="18" r="2"/><circle fill="#E1E1E1" cx="18" cy="18" r="1"/><path d="M19.47 21.74c-.534-.945-1.942-1.168-2.676-.333-1.471 2-2.751 4.115-3.758 6.396.165.084.332.166.502.242 1.159-1.045 2.205-2.182 3.19-3.376h2.545c.986 1.193 2.031 2.328 3.189 3.374.17-.076.337-.158.503-.243-.949-2.151-2.167-4.122-3.495-6.06zm9.47-4.883c-.019-.185-.056-.366-.084-.548-2.48.253-4.886.817-7.243 1.598-1.022.44-1.243 1.848-.511 2.647 1.433 1.863 2.933 3.632 4.689 5.202.132-.133.253-.277.378-.416-.636-1.422-1.392-2.764-2.221-4.068l.788-2.42c1.439-.569 2.852-1.215 4.204-1.995zM8.22 12.989c2.035 1.183 4.179 2.062 6.392 2.849.97.456 2.271-.209 2.36-1.303.015-2.482-.193-4.946-.719-7.382-.186.03-.372.055-.555.094a29.438 29.438 0 0 0-.479 3.228c-.048.448-.086.914-.116 1.385l-2.059 1.492c-1.496-.385-3.006-.688-4.554-.854-.094.161-.184.324-.27.491zm12.758 2.963c2.366-.753 4.646-1.712 6.801-2.966a10.398 10.398 0 0 0-.274-.496c-1.09.116-2.155.309-3.207.541-.441.092-.896.2-1.353.317l-2.056-1.497c-.096-1.545-.275-3.078-.598-4.606-.18-.038-.365-.063-.548-.092-.496 2.3-.67 4.61-.734 6.958-.134 1.062.901 2.094 1.969 1.841zm-10.77 9.804c1.756-1.57 3.255-3.339 4.689-5.202.733-.8.51-2.207-.51-2.647-2.356-.781-4.763-1.345-7.243-1.597-.028.183-.065.363-.084.548 1.352.78 2.765 1.426 4.204 1.994l.788 2.42c-.829 1.304-1.584 2.646-2.221 4.068.125.139.245.283.377.416z" fill="#AEB3B2"/><path d="M22.47 19.167a82.351 82.351 0 0 0 3.426-1.22 52.308 52.308 0 0 0 3.019-1.252c-.01-.088-.027-.173-.04-.26a62.722 62.722 0 0 0-7.04 1.919c-.674.258-.881 1.261-.413 1.792.05.074.2.261.251.338 1.327 1.782 2.712 3.524 4.204 5.176.063-.065.121-.134.182-.2-1.184-2.053-2.511-4.017-3.872-5.95-.12-.217.115-.289.283-.343zM9.94 25.461c.061.066.119.136.182.2 1.491-1.652 2.877-3.394 4.204-5.176.052-.075.202-.265.251-.338.47-.531.26-1.534-.412-1.792a62.878 62.878 0 0 0-7.04-1.919c-.012.087-.029.172-.04.26.997.446 2.001.871 3.02 1.252a82.87 82.87 0 0 0 3.426 1.22c.168.053.402.126.282.343-1.361 1.933-2.689 3.897-3.873 5.95zm9.288-3.199c-.055-.073-.189-.274-.244-.343-.36-.611-1.379-.722-1.832-.162a62.956 62.956 0 0 0-4 6.101c.079.039.158.078.238.115a51.875 51.875 0 0 0 2.12-2.481 83.43 83.43 0 0 0 2.219-2.882c.102-.143.244-.344.413-.162 1.42 1.893 2.878 3.764 4.466 5.525.081-.038.162-.077.242-.117-1.109-1.927-2.338-3.782-3.622-5.594zM8.275 12.873c2.033.909 4.12 1.689 6.226 2.4.492.185 1.019.348 1.513-.007.491-.359.498-.912.474-1.437-.024-2.222-.121-4.446-.358-6.659-.088.015-.177.023-.264.041-.244 2.293-.337 4.596-.357 6.898.002.176.005.422-.239.374-2.263-.698-4.544-1.354-6.865-1.846a9.21 9.21 0 0 0-.13.236zm11.237.957c.002.091-.008.333-.004.421-.068.706.691 1.394 1.387 1.208a62.78 62.78 0 0 0 6.828-2.588 8.529 8.529 0 0 0-.127-.231 51.55 51.55 0 0 0-3.178.762 83.22 83.22 0 0 0-3.489 1.027c-.167.056-.4.135-.43-.112-.036-2.369-.117-4.744-.367-7.105-.086-.017-.176-.025-.263-.04-.234 2.213-.331 4.436-.357 6.658z" fill="#E1E1E1"/></svg>
\ No newline at end of file