Merge pull request #557 from ThibG/glitch-soc/tentative-merge

Merge upstream changes

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f469-200d-1f469-200d-1f467-200d-1f466.svg b/public/emoji/1f469-200d-1f469-200d-1f467-200d-1f466.svg
index 1e84cdd35..976e8481d 100644
--- a/public/emoji/1f469-200d-1f469-200d-1f467-200d-1f466.svg
+++ b/public/emoji/1f469-200d-1f469-200d-1f467-200d-1f466.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 45 45" style="enable-background:new 0 0 45 45;" xml:space="preserve" version="1.1" id="svg2"><metadata id="metadata8"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/></cc:Work></rdf:RDF></metadata><defs id="defs6"><clipPath id="clipPath16" clipPathUnits="userSpaceOnUse"><path id="path18" d="M 0,0 36,0 36,36 0,36 0,0 Z"/></clipPath></defs><g transform="matrix(1.25,0,0,-1.25,0,45)" id="g10"><g id="g12"><g clip-path="url(#clipPath16)" id="g14"><g transform="translate(21,14)" id="g20"><path id="path22" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 5.055,0 7.527,-3.778 10.055,0 l 6,0 C 17.834,0 18,-1.193 18,-2.973 L 18,-14 13.972,-14 1.083,-14 -3,-14 -3,-2.973 C -3,-1 -2,0 0,0"/></g><g transform="translate(15,14)" id="g24"><path id="path26" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -5,0 -7.472,-3.778 -10,0 -16,0 c -1.779,0 -1.945,-1.193 -1.945,-2.973 l 0,-11.027 4.028,0 12.889,0 L 3,-14 3,-2.973 C 3,-1 2,0 0,0"/></g><path id="path28" style="fill:#7450a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 21.673,-1 -1.028,0 0,10 1.028,0 0,-10 z"/><g transform="translate(32.5381,35.1924)" id="g30"><path id="path32" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.333,0 -0.657,-0.034 -0.974,-0.09 -1.172,0.57 -2.175,0.898 -3.564,0.898 -4.907,0 -9,-4.093 -9,-9 l 0,-7 c 0.148,-5.224 4.241,-9.569 9.5,-9.569 5.259,0 9.352,4.345 9.5,9.569 l 0,10 C 5.462,-2.07 3.123,0 0,0"/></g><g transform="translate(21,32)" id="g34"><path id="path36" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-10 c 0.253,-3.89 3.521,-6.969 7.5,-6.969 3.979,0 7.247,3.079 7.5,6.969 L 15,0 0,0 Z"/></g><g transform="translate(32.6348,32.3271)" id="g38"><path id="path40" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.25,0.412 0.365,0.673 0.365,0.673 l -12,-1 -0.577,-5.693 c 5.692,0 9.024,2.305 10.815,4.21 0.415,-1.474 1.563,-3.517 4.762,-3.517 l 0,6 L 0,0 Z"/></g><g transform="translate(25.2695,18.231)" id="g42"><path id="path44" style="fill:#da2f47;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 3.23,0 6.461,0 C 6.461,0 5.653,-1.616 3.23,-1.616 0.808,-1.616 0,0 0,0"/></g><g transform="translate(29,20.5)" id="g46"><path id="path48" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1,0 C -1.276,0 -1.5,0.224 -1.5,0.5 -1.5,0.776 -1.276,1 -1,1 L 0,1 C 0.276,1 0.5,0.776 0.5,0.5 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(25,23)" id="g50"><path id="path52" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.553,3 0,3 0.553,3 1,2.552 1,2 L 1,1 C 1,0.448 0.553,0 0,0"/></g><g transform="translate(32,23)" id="g54"><path id="path56" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.553,3 0,3 0.553,3 1,2.552 1,2 L 1,1 C 1,0.448 0.553,0 0,0"/></g><g transform="translate(11.5381,35.1924)" id="g58"><path id="path60" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.333,0 -0.657,-0.034 -0.974,-0.09 -1.172,0.57 -2.175,0.898 -3.564,0.898 -4.907,0 -9,-4.093 -9,-9 l 0,-7 c 0.148,-5.224 4.241,-9.569 9.5,-9.569 5.259,0 9.352,4.345 9.5,9.569 l 0,10 C 5.462,-2.07 3.123,0 0,0"/></g><g transform="translate(0,32)" id="g62"><path id="path64" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-10 c 0.253,-3.89 3.521,-6.969 7.5,-6.969 3.979,0 7.247,3.079 7.5,6.969 L 15,0 0,0 Z"/></g><g transform="translate(11.6348,32.3271)" id="g66"><path id="path68" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.25,0.412 0.365,0.673 0.365,0.673 l -12,-1 -0.577,-5.693 c 5.692,0 9.024,2.305 10.815,4.21 0.415,-1.474 1.563,-3.517 4.762,-3.517 l 0,6 L 0,0 Z"/></g><g transform="translate(4.2695,18.231)" id="g70"><path id="path72" style="fill:#da2f47;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 3.23,0 6.461,0 C 6.461,0 5.653,-1.616 3.23,-1.616 0.808,-1.616 0,0 0,0"/></g><g transform="translate(8,20.5)" id="g74"><path id="path76" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1,0 C -1.276,0 -1.5,0.224 -1.5,0.5 -1.5,0.776 -1.276,1 -1,1 L 0,1 C 0.276,1 0.5,0.776 0.5,0.5 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(4,23)" id="g78"><path id="path80" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.553,3 0,3 0.553,3 1,2.552 1,2 L 1,1 C 1,0.448 0.553,0 0,0"/></g><g transform="translate(11,23)" id="g82"><path id="path84" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.553,3 0,3 0.553,3 1,2.552 1,2 L 1,1 C 1,0.448 0.553,0 0,0"/></g><g transform="translate(27.875,17)" id="g86"><path id="path88" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.298,0 -0.588,-0.029 -0.875,-0.07 -1.162,-0.029 -1.452,0 -1.75,0 c -3.383,0 -6.125,-2.742 -6.125,-6.125 0,-3.383 2.742,-6.125 6.125,-6.125 0.298,0 0.588,0.029 0.875,0.07 0.287,-0.041 0.577,-0.07 0.875,-0.07 3.383,0 6.125,2.742 6.125,6.125 C 6.125,-2.742 3.383,0 0,0"/></g><g transform="translate(29,2)" id="g90"><path id="path92" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,3 -4,0 0,-3 -1,0 0,-2 6,0 0,2 -1,0 z"/></g><g transform="translate(32,3)" id="g94"><path id="path96" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 -2,-2 -2,2 -2,0 c -3,0 -5,-2 -5,-4 l 9,0 9,0 C 4,-2.027 2,0 0,0"/></g><g transform="translate(33,13.2857)" id="g98"><path id="path100" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4.286,0.857 -12,0 l 0,-4.286 0.002,0 c 0,-0.013 -0.002,-0.026 -0.002,-0.04 0,-3.291 2.685,-5.96 5.998,-5.96 3.312,0 5.997,2.669 5.997,5.96 0,0.014 -0.002,0.027 -0.002,0.04 L 0,-4.286 0,0 Z"/></g><g transform="translate(34,10.875)" id="g102"><path id="path104" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.875,2.625 -4.137,4.044 -13.125,2.625 -13.878,0 c 4.734,0 7.372,1.536 8.807,2.946 C -3.99,1.67 -2.163,0 0,0"/></g><g transform="translate(29,6)" id="g106"><path id="path108" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 -2,0 c 0,0 0.389,-1.333 2,-1.333 1.611,0 2,1.333 2,1.333"/></g><g transform="translate(27,6.5)" id="g110"><path id="path112" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.13,0 -0.26,0.05 -0.35,0.15 -0.1,0.09 -0.15,0.22 -0.15,0.35 0,0.13 0.05,0.26 0.15,0.36 C -0.18,1.03 0.17,1.04 0.36,0.851 0.45,0.76 0.5,0.63 0.5,0.5 0.5,0.37 0.45,0.24 0.35,0.15 0.26,0.05 0.13,0 0,0"/></g><g transform="translate(29,8)" id="g114"><path id="path116" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.461,0 -0.833,0.373 -0.833,0.833 l 0,0.834 C -0.833,2.127 -0.461,2.5 0,2.5 0.461,2.5 0.833,2.127 0.833,1.667 l 0,-0.834 C 0.833,0.373 0.461,0 0,0"/></g><g transform="translate(25,8)" id="g118"><path id="path120" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.461,0 -0.833,0.373 -0.833,0.833 l 0,0.834 C -0.833,2.127 -0.461,2.5 0,2.5 0.461,2.5 0.833,2.127 0.833,1.667 l 0,-0.834 C 0.833,0.373 0.461,0 0,0"/></g><g transform="translate(16,11)" id="g122"><path id="path124" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.125,-3.313 1,-7 0,0 -3.344,-2 -8,-2 0,1.563 7,9 7,9"/></g><g transform="translate(2,10.875)" id="g126"><path id="path128" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.125,-3.188 -1,-6.875 0,0 3.344,-2 8,-2 C 7,-7.312 0,0 0,0"/></g><g transform="translate(9.875,17)" id="g130"><path id="path132" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.298,0 -0.588,-0.029 -0.875,-0.07 -1.162,-0.029 -1.452,0 -1.75,0 c -3.383,0 -6.125,-2.742 -6.125,-6.125 0,-3.383 2.742,-6.125 6.125,-6.125 0.298,0 0.588,0.029 0.875,0.07 0.287,-0.041 0.577,-0.07 0.875,-0.07 3.383,0 6.125,2.742 6.125,6.125 C 6.125,-2.742 3.383,0 0,0"/></g><g transform="translate(11,2)" id="g134"><path id="path136" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,3 -4,0 0,-3 -1,0 0,-2 6,0 0,2 -1,0 z"/></g><g transform="translate(14,3)" id="g138"><path id="path140" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 -2,-2 -2,2 -2,0 c -3,0 -5,-2 -5,-4 l 9,0 9,0 C 4,-2.027 2,0 0,0"/></g><g transform="translate(15,13.2857)" id="g142"><path id="path144" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4.286,0.857 -12,0 l 0,-4.286 0.002,0 c 0,-0.013 -0.002,-0.026 -0.002,-0.04 0,-3.291 2.685,-5.96 5.998,-5.96 3.312,0 5.997,2.669 5.997,5.96 0,0.014 -0.002,0.027 -0.002,0.04 L 0,-4.286 0,0 Z"/></g><g transform="translate(16,10.875)" id="g146"><path id="path148" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.875,2.625 -4.137,4.044 -13.125,2.625 -13.878,0 c 4.734,0 7.372,1.536 8.807,2.946 C -3.99,1.67 -2.163,0 0,0"/></g><g transform="translate(11,6)" id="g150"><path id="path152" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 -2,0 c 0,0 0.389,-1.333 2,-1.333 1.611,0 2,1.333 2,1.333"/></g><g transform="translate(9,6.5)" id="g154"><path id="path156" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.13,0 -0.26,0.05 -0.35,0.15 -0.1,0.09 -0.15,0.22 -0.15,0.35 0,0.13 0.05,0.26 0.15,0.36 C -0.18,1.03 0.17,1.04 0.36,0.851 0.45,0.76 0.5,0.63 0.5,0.5 0.5,0.37 0.45,0.24 0.35,0.15 0.26,0.05 0.13,0 0,0"/></g><g transform="translate(11,8)" id="g158"><path id="path160" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.461,0 -0.833,0.373 -0.833,0.833 l 0,0.834 C -0.833,2.127 -0.461,2.5 0,2.5 0.461,2.5 0.833,2.127 0.833,1.667 l 0,-0.834 C 0.833,0.373 0.461,0 0,0"/></g><g transform="translate(7,8)" id="g162"><path id="path164" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.461,0 -0.833,0.373 -0.833,0.833 l 0,0.834 C -0.833,2.127 -0.461,2.5 0,2.5 0.461,2.5 0.833,2.127 0.833,1.667 l 0,-0.834 C 0.833,0.373 0.461,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFDC5D" d="M21 14c.253 3.89 3.521 6.969 7.5 6.969S35.747 17.89 36 14V4H21v10z"/><path fill="#FFAC33" d="M36 21.752V14c-.253 3.89-3.521 6.969-7.5 6.969S21.253 17.89 21 14V9.663c5.328-.155 8.51-2.343 10.237-4.181C31.652 6.957 32.801 9 36 9V1.9c-.931-.689-2.115-1.093-3.462-1.093-.333 0-.657.034-.974.09C30.393.328 29.39 0 28 0c-4.907 0-9 4.093-9 9v7c.064 2.258.868 4.35 2.182 6L24 24h9l2.818-2c.064-.08.121-.166.182-.248z"/><path fill="#9268CA" d="M35.818 22H21c-2 0-3 1-3 2.973V36h18V22h-.182z"/><path fill="#7450A8" d="M20.986 26h1.028v10h-1.028z"/><path fill="#FFDC5D" d="M26 19v3c0 1.381 1.119 2.5 2.5 2.5S31 23.381 31 22v-3h-5z"/><path fill="#DA2F47" d="M25.27 17.769h6.46s-.808 1.616-3.23 1.616-3.23-1.616-3.23-1.616z"/><path fill="#BF6952" d="M29 15.5h-1c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h1c.276 0 .5.224.5.5s-.224.5-.5.5z"/><path fill="#662113" d="M25 13c-.553 0-1-.448-1-1v-1c0-.552.447-1 1-1s1 .448 1 1v1c0 .552-.447 1-1 1zm7 0c-.553 0-1-.448-1-1v-1c0-.552.447-1 1-1s1 .448 1 1v1c0 .552-.447 1-1 1z"/><path fill="#FFDC5D" d="M0 14c.253 3.89 3.521 6.969 7.5 6.969S14.747 17.89 15 14V4H0v10z"/><path fill="#FFAC33" d="M17 16V6C17 2.878 14.661.808 11.538.808c-.333 0-.657.034-.974.09C9.393.328 8.39 0 7 0 4.195 0 1.661 1.34 0 3.402v6.261c5.328-.155 8.51-2.343 10.237-4.181C10.652 6.957 11.801 9 15 9v5c-.253 3.89-3.521 6.969-7.5 6.969S.253 17.89 0 14v7.752c.061.082.118.168.182.248L3 24h9l2.818-2c1.314-1.65 2.118-3.742 2.182-6z"/><path fill="#9266CC" d="M15 22H0v14h18V24.973C18 23 17 22 15 22z"/><path fill="#7450A8" d="M13.986 26h1.028v10h-1.028z"/><path fill="#FFDC5D" d="M5 19v3c0 1.381 1.119 2.5 2.5 2.5S10 23.381 10 22v-3H5z"/><path fill="#DA2F47" d="M4.269 17.769h6.462s-.808 1.616-3.231 1.616-3.231-1.616-3.231-1.616z"/><path fill="#BF6952" d="M8 15.5H7c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h1c.276 0 .5.224.5.5s-.224.5-.5.5z"/><path fill="#662113" d="M4 13c-.553 0-1-.448-1-1v-1c0-.552.447-1 1-1s1 .448 1 1v1c0 .552-.447 1-1 1zm7 0c-.553 0-1-.448-1-1v-1c0-.552.447-1 1-1s1 .448 1 1v1c0 .552-.447 1-1 1z"/><path fill="#FFDC5D" d="M28.998 34v-3h-4v3h-1v2h6v-2z"/><path fill="#88C9F9" d="M24.998 33h-2c-2.493 0-4.276 1.385-4.814 3h17.632c-.517-1.602-2.159-3-3.818-3h-3l-.466.466L26.998 35l-2-2z"/><path fill="#FFDC5D" d="M32.993 27.04l-.002-.04h.007v-4.286l-4.286-.857-7.714.857V27H21l-.002.04c0 .644.106 1.263.296 1.844.782 2.388 3.038 4.116 5.702 4.116 2.659 0 4.911-1.722 5.697-4.103.192-.585.3-1.208.3-1.857z"/><path fill="#F4900C" d="M33.998 25.125c0-3.383-2.742-6.125-6.125-6.125-.298 0-.588.029-.875.07-.286-.041-.577-.07-.875-.07-3.383 0-6.125 2.742-6.125 6.125 0 1.418.487 2.721 1.296 3.759-.19-.581-.296-1.2-.296-1.844L21 27h-.002v-1.911c4.172-.181 6.588-1.592 7.929-2.91.91 1.074 2.351 2.414 4.071 2.816V27h-.007l.002.04c0 .649-.108 1.272-.301 1.857.816-1.04 1.306-2.348 1.306-3.772z"/><path fill="#BF6952" d="M28.998 30h-4s.389 1.333 2 1.333 2-1.333 2-1.333zm-2-.5c-.13 0-.26-.05-.35-.15-.1-.09-.15-.22-.15-.35s.05-.26.15-.36c.17-.17.52-.18.71.01.09.091.14.221.14.351s-.05.26-.15.35c-.09.099-.22.149-.35.149z"/><path fill="#662113" d="M28.998 28c-.461 0-.833-.373-.833-.833v-.833c0-.461.373-.833.833-.833.461 0 .833.373.833.833v.833c.001.46-.372.833-.833.833zm-4 0c-.461 0-.833-.373-.833-.833v-.833c0-.461.373-.833.833-.833.461 0 .833.373.833.833v.833c.001.46-.372.833-.833.833z"/><path fill="#FFDC5D" d="M2.998 22.714V27H3l-.002.04c0 3.291 2.685 5.96 5.997 5.96s5.997-2.669 5.997-5.96L14.99 27h.007v-4.286l-4.286-.857-7.713.857z"/><path fill="#F4900C" d="M15.995 25.192c0-.023.003-.044.003-.067l-.002-.039.002-.086-.006.006C15.928 21.679 13.216 19 9.873 19c-.298 0-.588.029-.875.07-.286-.041-.577-.07-.875-.07-3.383 0-6.125 2.742-6.125 6.125 0 0 .125 3.188-1 6.875 0 0 3.344 2 8 2s8-2 8-2c-.968-3.172-1.01-6.061-1.003-6.808zm-1.002 1.848c0 3.291-2.685 5.96-5.997 5.96s-5.997-2.669-5.997-5.96C2.998 27.027 3 27.013 3 27h-.002v-1.911c4.172-.181 6.588-1.592 7.929-2.91.91 1.074 2.351 2.414 4.071 2.816V27h-.007l.002.04z"/><path fill="#FFDC5D" d="M10.998 34v-3h-4v3h-1v2h6v-2z"/><path fill="#EA596E" d="M13.998 33h-3l-2 2-1.41-1.41-.59-.59h-2C2.505 33 .722 34.385.184 36h17.632c-.518-1.602-2.159-3-3.818-3z"/><path fill="#BF6952" d="M10.998 30h-4s.389 1.333 2 1.333 2-1.333 2-1.333zm-2-.5c-.13 0-.26-.05-.35-.15-.1-.09-.15-.22-.15-.35s.05-.26.15-.36c.17-.17.52-.18.71.01.09.091.14.221.14.351s-.05.26-.15.35c-.09.099-.22.149-.35.149z"/><path fill="#662113" d="M10.998 28c-.461 0-.833-.373-.833-.833v-.833c0-.461.373-.833.833-.833.461 0 .833.373.833.833v.833c.001.46-.372.833-.833.833zm-4 0c-.461 0-.833-.373-.833-.833v-.833c0-.461.373-.833.833-.833.461 0 .833.373.833.833v.833c.001.46-.372.833-.833.833z"/></svg>
\ No newline at end of file