Merge pull request #157 from glitch-soc/merging-upstream

ABRACA-HRRRRRRRRRRRNGGGGGGGHHH!!!!!!!!!!!!!!!!!!!

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f939-1f3ff.svg b/public/emoji/1f939-1f3ff.svg
index b1d6168a0..ec0982810 100644
--- a/public/emoji/1f939-1f3ff.svg
+++ b/public/emoji/1f939-1f3ff.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" enable-background="new 0 0 64 64"><path d="m48 6c0 2.2-1.8 4-4 4-2.2 0-4-1.8-4-4 0-2.2 1.8-4 4-4 2.2 0 4 1.8 4 4" fill="#42ade2"/><circle cx="6" cy="30" r="4" fill="#c28fef"/><path d="m17 10c0 2.2-1.8 4-4 4-2.2 0-4-1.8-4-4 0-2.2 1.8-4 4-4 2.2 0 4 1.8 4 4" fill="#ed4c5c"/><path d="m62 24c0 2.2-1.8 4-4 4-2.2 0-4-1.8-4-4 0-2.2 1.8-4 4-4 2.2 0 4 1.8 4 4" fill="#ffce31"/><circle cx="54" cy="53" r="4" fill="#83bf4f"/><path d="m57 56.1l-1.3 2.6 2.5 1.5c0 0 .8-2.4 1-3.2.3-1.4-1.4-2.3-2.2-.9" fill="#705041"/><g fill="#3b946f"><path d="m18 56.3c2.2 0 3-1.6 3.5-2.6 1.1-2.6 4.1-10.5 4.1-10.5h-2.7c-1.5 0-2.4.7-2.7 1.4l-2.8 7.4h-3.3l1.2 2.6c.4.6 1.2 1.7 2.7 1.7"/><path d="m50.3 61.6c-2.2 0-2.5-.8-3.1-2.7l-5.5-15.7h2.7c1.5 0 2.4.7 2.7 1.4l3.8 12.6h3.3l-1.2 2.7c-.4.6-1.2 1.7-2.7 1.7"/></g><path d="m13.2 47.6l1.3 2.6-2.5 1.5c0 0-.8-2.4-1-3.2-.3-1.5 1.4-2.3 2.2-.9" fill="#705041"/><g fill="#8a6859"><path d="m11.7 51.5v-2.6c.3-1.9 9.4-1.9 9.1 0v2.6c-.2 1.9-9.3 1.9-9.1 0"/><path d="m58.5 60v-2.6c-.3-1.9-9.4-1.9-9.1 0v2.6c.2 1.9 9.3 1.9 9.1 0"/><path d="m36 41.6v-1.7h-4.7v1.7c0 1-.7 1.7-1.6 1.7h7.9c-.9 0-1.6-.7-1.6-1.7"/><path d="m27.5 43.2h12.3v7.1h-12.3z"/></g><path d="m44.2 43.2h-5.9c-.5 2.2-2.4 3.9-4.7 3.9-2.3 0-4.2-1.7-4.7-3.9h-5.9v18.8h21.1l.1-18.8" fill="#47b892"/><path d="m20.1 26.3l1.4 2.6h24.4l1.1-2.7c0-9.8-2.3-14-13.1-14.1-11.1-.1-13.8 4.3-13.8 14.2" fill="#231f20"/><path d="m45.9 26.2c-.1.6-.2 1.1-.4 1.4-.3.5-.9.8-.9.8s.2-1.1.1-2.6c-.6-9-1.1-4.7-11.1-4.7-10 0-10.5-4.3-11.1 4.7-.1 1.5.1 2.6.1 2.6s-.6-.3-.9-.8c-.2-.3-.3-.8-.4-1.4-.9-.2-2.2 0-2.2 2.7 0 1.7.6 3.1 2.7 3.2.7 5.6 8.3 9.4 11.7 9.4s10.9-3.8 11.7-9.4c2.1-.1 2.7-1.5 2.7-3.2.1-2.8-1.1-3-2-2.7" fill="#8a6859"/><g fill="#574137"><circle cx="28.6" cy="27.1" r="2.1"/><circle cx="38.8" cy="27.1" r="2.1"/><path d="m37.7 34.7c0 1.5-2 2.3-4 2.3s-4-.8-4-2.3c0 0 0-.4.4-.4 1.8 0 5.4 0 7.2 0 .4 0 .4.4.4.4"/></g></svg>
\ No newline at end of file
+<?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="clipPath20" clipPathUnits="userSpaceOnUse"><path id="path22" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath></defs><g transform="matrix(1.25,0,0,-1.25,0,45)" id="g10"><g transform="translate(26.0172,9.0009)" id="g12"><path id="path14" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -20.017,0 0,-9.001 23.999,0 0,9.835 L -0.017,0.836 0,0 Z"/></g><g id="g16"><g clip-path="url(#clipPath20)" id="g18"><g transform="translate(14,9.001)" id="g24"><path id="path26" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0.85,-2.064 3.55,-2.064 6.25,-2.064 7,0 7,0 L 6.976,3.9 0,4 0,0 Z"/></g><g transform="translate(14.0659,10.9707)" id="g28"><path id="path30" style="fill:#664131;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.058,-1.207 2.049,-1.51 3.477,-1.51 1.426,0 2.426,0.304 3.484,1.51 l 0,3.515 L 0,3.515 0,0 Z"/></g><g transform="translate(11.8423,19.813)" id="g32"><path id="path34" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.271 -0.639,-2.304 -1.426,-2.304 -0.788,0 -1.427,1.033 -1.427,2.304 0,1.272 0.639,2.305 1.427,2.305 C -0.639,2.305 0,1.272 0,0"/></g><g transform="translate(26.1016,19.813)" id="g36"><path id="path38" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.271 -0.638,-2.304 -1.424,-2.304 -0.789,0 -1.428,1.033 -1.428,2.304 0,1.272 0.639,2.305 1.428,2.305 C -0.638,2.305 0,1.272 0,0"/></g><g transform="translate(10.1304,18.9131)" id="g40"><path id="path42" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,4.911 3.32,8.893 7.416,8.893 4.095,0 7.415,-3.982 7.415,-8.893 0,-4.91 -3.32,-8.893 -7.415,-8.893 C 3.32,-8.893 0,-4.91 0,0"/></g><g transform="translate(17.5464,12.9014)" id="g44"><path id="path46" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.396,0 -3.132,0.62 -3.256,0.745 -0.222,0.225 -0.222,0.59 0,0.816 C -3.04,1.778 -2.694,1.783 -2.47,1.58 -2.425,1.548 -1.843,1.152 0,1.152 1.915,1.152 2.466,1.578 2.472,1.583 2.695,1.806 3.045,1.796 3.268,1.569 3.491,1.345 3.478,0.97 3.255,0.745 3.132,0.62 2.397,0 0,0"/></g><g transform="translate(17.5464,30.7573)" id="g48"><path id="path50" style="fill:#0b0200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.915,0 7.986,-3.663 7.986,-6.714 0,-3.051 -0.614,-4.272 -1.229,-3.051 -0.615,1.22 -1.228,2.44 -1.228,2.44 0,0 -3.687,0 -4.915,1.223 0,0 1.844,-3.663 -1.843,0 0,0 0.614,-2.443 -3.071,0.609 0,0 -1.844,-1.221 -2.457,-4.272 -0.171,-0.847 -1.229,0 -1.229,3.051 C -7.986,-3.663 -5.528,0 0,0"/></g><g transform="translate(14.0659,18.8779)" id="g52"><path id="path54" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.479,0 -0.87,0.395 -0.87,0.878 l 0,0.879 c 0,0.483 0.391,0.879 0.87,0.879 0.479,0 0.87,-0.396 0.87,-0.879 l 0,-0.879 C 0.87,0.395 0.479,0 0,0"/></g><g transform="translate(21.0273,18.8779)" id="g56"><path id="path58" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.479,0 -0.87,0.395 -0.87,0.878 l 0,0.879 c 0,0.483 0.391,0.879 0.87,0.879 0.477,0 0.87,-0.396 0.87,-0.879 l 0,-0.879 C 0.87,0.395 0.477,0 0,0"/></g><g transform="translate(18.1992,16.4609)" id="g60"><path id="path62" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.306,0 c -0.359,0 -0.652,0.296 -0.652,0.659 0,0.362 0.293,0.659 0.652,0.659 L 0,1.318 C 0.359,1.318 0.652,1.021 0.652,0.659 0.652,0.296 0.359,0 0,0"/></g><g transform="translate(5.8945,21.7949)" id="g64"><path id="path66" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -3.834,-1.39 -4.214,-6.221 0,0 -2.4,4.817 -0.522,10.15 L 0,0 Z"/></g><g transform="translate(20.0508,30.0229)" id="g68"><path id="path70" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -2.758,3.005 -7.363,1.497 0,0 3.523,4.069 9.168,4.386 L 0,0 Z"/></g><g transform="translate(29.2715,19.6631)" id="g72"><path id="path74" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 1.972,3.571 -0.923,7.457 0,0 4.978,-2.046 7.075,-7.296 L 0,0 Z"/></g><g transform="translate(8.103,25.0137)" id="g76"><path id="path78" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.933 -1.567,-3.5 -3.5,-3.5 -5.433,-3.5 -7,-1.933 -7,0 -7,1.933 -5.433,3.5 -3.5,3.5 -1.567,3.5 0,1.933 0,0"/></g><g transform="translate(26.0156,32.5)" id="g80"><path id="path82" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.933 -1.566,-3.5 -3.5,-3.5 -5.433,-3.5 -7,-1.933 -7,0 -7,1.933 -5.433,3.5 -3.5,3.5 -1.566,3.5 0,1.933 0,0"/></g><g transform="translate(35.8955,18.1455)" id="g84"><path id="path86" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.933 -1.566,-3.5 -3.5,-3.5 -5.434,-3.5 -7,-1.933 -7,0 -7,1.933 -5.434,3.5 -3.5,3.5 -1.566,3.5 0,1.933 0,0"/></g><g transform="translate(32.6455,12.5117)" id="g88"><path id="path90" style="fill:#664131;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.111,0.538 -0.634,0.884 -1.169,0.774 l -2.057,-0.43 -1.808,0 c -0.85,0 -1.538,-0.696 -1.538,-1.555 l 0,-0.776 0,-0.777 3.846,0 c 0.83,0 1.503,0.666 1.533,1.496 l 0.273,0.057 0.503,0 c 0,0.059 -0.022,0.113 -0.035,0.169 C -0.11,-0.827 0.085,-0.421 0,0"/></g><g transform="translate(36.0752,12.0791)" id="g92"><path id="path94" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.429 -0.344,0.776 -0.77,0.776 L -5.386,0 -9.232,0 c -0.426,0 -0.77,-0.349 -0.77,-0.778 l -0.073,-1.551 1.611,-0.002 3.078,0 4.616,1.553 C -0.77,-0.778 0,-0.43 0,0"/></g><g transform="translate(3.4302,8.7637)" id="g96"><path id="path98" style="fill:#664131;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.11,0.538 0.633,0.884 1.168,0.774 l 2.058,-0.43 1.807,0 c 0.85,0 1.539,-0.696 1.539,-1.555 l 0,-0.776 0,-0.777 -3.847,0 c -0.829,0 -1.503,0.666 -1.532,1.496 l -0.273,0.057 -0.503,0 c 0,0.059 0.022,0.113 0.035,0.169 C 0.11,-0.827 -0.085,-0.421 0,0"/></g><g transform="translate(0,8.3311)" id="g100"><path id="path102" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.429 0.344,0.776 0.769,0.776 L 5.386,0 9.233,0 c 0.425,0 0.769,-0.349 0.769,-0.778 l 0,-1.553 -1.539,0 -3.077,0 -4.617,1.553 C 0.769,-0.778 0,-0.43 0,0"/></g><path id="path104" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 11,6 -1,0 0,-6 1,0 0,6 z"/><path id="path106" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26,9 -1,0 0,-9 1,0 0,9 z"/></g></g></g></svg>