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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f39f.svg b/public/emoji/1f39f.svg
index 6e4c9b692..59db5eb8c 100644
--- a/public/emoji/1f39f.svg
+++ b/public/emoji/1f39f.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="m64 41.7l-.9-2.5c0 0 0 0 0 0-.7.3-1.5-.1-1.7-.8-.3-.7.1-1.5.8-1.7l-1-2.7c0 0 0 0 0 0-.7.3-1.5-.1-1.7-.8-.3-.7.1-1.5.8-1.7l-.9-2.5c0 0 0 0 0 0-.7.3-1.5-.1-1.7-.8-.3-.7.1-1.5.8-1.7l-.9-2.5c0 0 0 0 0 0-.7.2-1.4-.1-1.7-.7-2.7.3-5.4-1.2-6.3-3.9l-37.4 13.4c1.1 3.1-.5 6.5-3.6 7.7l7.3 19.9c3.1-1.1 6.5.5 7.7 3.6l37.3-13.6c-1-2.7.1-5.6 2.4-7.1-.3-.6 0-1.4.7-1.6" fill="#fbbf67"/><path d="m56.6 46.7l-32.2 11.7c-1.7.6-3.6-.3-4.3-2l-5.7-15.7c-.6-1.7.3-3.6 2-4.3l32.2-11.7c1.7-.6 3.6.3 4.3 2l5.7 15.7c.6 1.8-.3 3.7-2 4.3m-39.6-8.6c-.9.3-1.3 1.3-1 2.1l5.7 15.7c.3.9 1.3 1.3 2.1 1l32.2-11.7c.9-.3 1.3-1.3 1-2.1l-5.7-15.7c-.3-.9-1.3-1.3-2.1-1l-32.2 11.7" fill="#f55"/><g fill="#89664c"><path d="m30.9 43.1l-.9.3c-.1 0-.2 0-.2-.1l-.5-1-.6.2.3 1.1c0 .1 0 .2-.1.2l-.9.3c-.1 0-.1 0-.2-.1l-1.7-6.9c0-.1 0-.2.1-.2l1.3-.5c.1 0 .2 0 .2.1l3.2 6.4c.1.1.1.2 0 .2m-2.1-1.9l-1.2-2.6h-.1l.8 2.7.5-.1"/><path d="m32.8 37.1l1.2 3.4c.2.7-.1 1.4-.8 1.7l-1.5.5c-.1 0-.2 0-.2-.1l-2-5.6c0-.1 0-.2.1-.2l1.5-.5c.7-.2 1.5.1 1.7.8m-1.1.5c0-.1-.2-.2-.3-.2l-.4.1 1.4 3.8.3-.1c.1 0 .2-.2.1-.3l-1.1-3.3"/><path d="m37 34.3l2.1 5.6c0 .1 0 .2-.1.2l-.9.3c-.1 0-.2 0-.2-.1l-1-2.6.2 2.6c0 .1-.1.1-.1 0l-1.5-2.1 1 2.6c0 .1 0 .2-.1.2l-.9.3c-.1 0-.2 0-.2-.1l-2.1-5.6c0-.1 0-.2.1-.2l.8-.3c.1 0 .2 0 .2.1l1.9 2.8-.3-3.3c0-.1 0-.2.1-.2l.8-.3c.1 0 .2 0 .2.1"/><path d="m41.1 39.2c0 .1 0 .2-.1.2l-.9.3c-.1 0-.2 0-.2-.1l-2-5.6c0-.1 0-.2.1-.2l.9-.3c.1 0 .2 0 .2.1l2 5.6"/><path d="m42.6 32.3l.3.9c0 .1 0 .2-.1.2l-.7.3 1.7 4.6c0 .1 0 .2-.1.2l-.9.3c-.1 0-.2 0-.2-.1l-1.6-4.7-.7.3c-.1 0-.2 0-.2-.1l-.3-.9c0-.1 0-.2.1-.2l2.5-.9c.1 0 .2 0 .2.1"/><path d="m35.7 50.3l-.4.1c-.7.2-1.4-.1-1.7-.8l-1.6-4.6c-.2-.7.1-1.4.8-1.7l.4-.1c.7-.2 1.4.1 1.7.8l1.7 4.6c.2.6-.2 1.4-.9 1.7m-2.3-6c-.2.1-.3.2-.2.4l1.6 4.5c0 .1.2.2.3.1h.1c.1 0 .2-.2.2-.3l-1.6-4.5c-.1-.2-.3-.2-.4-.2"/><path d="m38.8 42.5l2.1 5.6c0 .1 0 .2-.1.2l-.6.2c-.1 0-.2 0-.2-.1l-2-2.2.9 2.6c0 .1 0 .2-.1.2l-.9.3c-.1 0-.2 0-.2-.1l-2.1-5.6c0-.1 0-.2.1-.2l.7-.2c.1 0 .2 0 .2.1l2.1 2.5-1-2.9c0-.1 0-.2.1-.2l.9-.3c0 0 .1 0 .1.1"/><path d="m43.8 46.1l.3.9c0 .1 0 .2-.1.2l-2.1.8c-.1 0-.2 0-.2-.1l-2.1-5.6c0-.1 0-.2.1-.2l2.1-.8c.1 0 .2 0 .2.1l.3.9c0 .1 0 .2-.1.2l-1.1.4.4 1.1 1-.4c.1 0 .2 0 .2.1l.3.9c0 .1 0 .2-.1.2l-1 .4.5 1.3 1.1-.4c.2-.1.3-.1.3 0"/></g><g opacity=".5" fill="#947151"><path d="m25.4 54.8l30.4-25.5c-1.5-1.8-1.7-4.1-.9-6.1-2.4-.1-4.5-1.6-5.4-3.9l-37.3 13.5c1.1 3.1-.5 6.5-3.6 7.7l2.3 6.4 6 7.2c2.6-2.2 6.3-1.8 8.5.7"/><path d="m25.4 54.8l30.4-25.5c-1.5-1.8-1.7-4.1-.9-6.1-2.4-.1-4.5-1.6-5.4-3.9l-37.3 13.5c1.1 3.1-.5 6.5-3.6 7.7l2.3 6.4 6 7.2c2.6-2.2 6.3-1.8 8.5.7" opacity=".5"/></g><path d="m52.5 16.1l-1.7-2.1c0 0 0 0 0 0-.6.5-1.4.4-1.9-.2-.5-.6-.4-1.4.2-1.9l-1.7-2.1c0 0 0 0 0 0-.6.5-1.4.4-1.9-.2-.5-.6-.4-1.4.2-1.9l-1.7-2.1c0 0 0 0 0 0-.6.5-1.4.4-1.9-.2-.7-.4-.6-1.2-.1-1.7l-1.7-2.1c0 0 0 0 0 0-.6.5-1.4.4-1.9-.1-2.4 1.2-5.4.7-7.3-1.5l-30.4 25.5c2.2 2.6 1.8 6.4-.7 8.5l13.6 16.3c2.5-2.1 6.3-1.8 8.4.7l30.4-25.5c-1.8-2.2-1.8-5.3-.2-7.5-.3-.6-.2-1.4.3-1.9" fill="#fbbf67"/><path d="m47.2 23.4l-26.2 22c-1.4 1.2-3.5 1-4.7-.4l-10.7-12.8c-1.2-1.4-1-3.5.4-4.7l26.2-22c1.4-1.2 3.5-1 4.7.4l10.7 12.8c1.2 1.4 1 3.5-.4 4.7m-40.1 5.4c-.7.6-.8 1.6-.2 2.3l10.7 12.9c.6.7 1.6.8 2.3.2l26.2-22c.7-.6.8-1.6.2-2.3l-10.7-12.9c-.6-.7-1.6-.8-2.3-.2l-26.2 22" fill="#f55"/><g fill="#89664c"><path d="m21.9 28.8l-.7.6c-.1.1-.2 0-.2 0l-.8-.8-.6.4.7.9c0 .1 0 .2 0 .2l-.7.6c-.1.1-.1 0-.2 0l-3.9-5.9c0-.1 0-.2 0-.2l1.1-.9c.1-.1.2-.1.2 0l5.1 4.9c0 .1 0 .1 0 .2m-2.6-1.1l-2-2.1-.1.1 1.7 2.3.4-.3"/><path d="m21.6 22.5l2.3 2.8c.5.6.4 1.4-.2 1.9l-1.2 1c-.1.1-.2 0-.2 0l-3.9-4.6c-.1-.1 0-.2 0-.2l1.2-1c.7-.5 1.5-.5 2 .1m-.9.8c-.1-.1-.3-.1-.4 0l-.3.2 2.6 3.1.3-.2c.1-.1.1-.2 0-.4l-2.2-2.7"/><path d="m24.6 18.4l3.9 4.6c.1.1 0 .2 0 .2l-.8.6c-.1.1-.2 0-.2 0l-1.8-2.1 1.1 2.4c0 .1 0 .1-.1.1l-2.1-1.5 1.8 2.1c.1.1 0 .2 0 .2l-.8.6c-.1.1-.2 0-.2 0l-3.9-4.6c-.1-.1 0-.2 0-.2l.7-.6c.1-.1.2 0 .2 0l2.7 1.9-1.4-3c0-.1 0-.2 0-.2l.7-.6c.1.1.2.1.2.1"/><path d="m30.2 21.6c.1.1 0 .2 0 .2l-.7.6c-.1.1-.2 0-.2 0l-3.9-4.6c-.1-.1 0-.2 0-.2l.7-.6c.1-.1.2 0 .2 0l3.9 4.6"/><path d="m29.2 14.6l.6.7c.1.1 0 .2 0 .2l-.6.5 3.2 3.8c.1.1 0 .2 0 .2l-.7.6c-.1 0-.2 0-.2 0l-3.2-3.8-.6.5c-.1.1-.2 0-.2 0l-.6-.7c-.1-.1 0-.2 0-.2l2.1-1.7c0-.1.1-.1.2-.1"/><path d="m28.9 33.9l-.3.3c-.6.5-1.4.4-1.9-.2l-3.1-3.7c-.5-.6-.4-1.4.2-1.9l.3-.3c.6-.5 1.4-.4 1.9.2l3 3.7c.5.6.4 1.4-.1 1.9m-4.3-4.8c-.2.1-.2.3-.1.4l3.1 3.6c.1.1.2.1.4 0l.1-.1c.1-.1.1-.3 0-.4l-3.1-3.5c-.1-.1-.3-.1-.4 0"/><path d="m29.1 25.5l3.9 4.6c.1.1 0 .2 0 .2l-.5.4c-.1.1-.2.1-.2 0l-2.6-1.4 1.8 2.1c.1.1 0 .2 0 .2l-.7.6c-.1.1-.2 0-.2 0l-3.9-4.6c-.1-.1 0-.2 0-.2l.5-.4c.1-.1.2-.1.2 0l2.8 1.6-2-2.3c-.1-.1 0-.2 0-.2l.7-.6c0 0 .1 0 .2 0"/><path d="m35 27.2l.6.7c.1.1 0 .2 0 .2l-1.7 1.5c-.1.1-.2 0-.2 0l-3.9-4.6c-.1-.1 0-.2 0-.2l1.7-1.5c.1-.1.2 0 .2 0l.6.7c.1.1 0 .2 0 .2l-.9.8.8.9.8-.7c.1-.1.2 0 .2 0l.6.7c.1.1 0 .2 0 .2l-.8.7.9 1.1.9-.8c.1 0 .2 0 .2.1"/></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="clipPath16" clipPathUnits="userSpaceOnUse"><path id="path18" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath32" clipPathUnits="userSpaceOnUse"><path id="path34" d="M 20.678,35.403 0.592,15.326 c -0.74,-0.741 -0.74,-1.942 0.001,-2.679 l 0,0 2.359,-2.361 c 1.684,0.675 3.681,0.333 5.047,-1.032 l 0,0 C 9.361,7.889 9.704,5.891 9.031,4.208 l 0,0 3.607,-3.613 c 0.74,-0.737 1.938,-0.739 2.681,0 l 0,0 20.087,20.075 c 0.742,0.744 0.742,1.941 0.005,2.68 l 0,0 -3.614,3.611 c -1.682,-0.675 -3.682,-0.333 -5.046,1.033 l 0,0 c -1.365,1.366 -1.71,3.364 -1.034,5.046 l 0,0 -2.36,2.362 c -0.372,0.371 -0.857,0.557 -1.342,0.557 l 0,0 c -0.484,0 -0.968,-0.186 -1.337,-0.556"/></clipPath><clipPath id="clipPath48" clipPathUnits="userSpaceOnUse"><path id="path50" 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 id="g12"><g clip-path="url(#clipPath16)" id="g14"><g transform="translate(26.751,27.9935)" id="g20"><path id="path22" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.364,-1.365 3.364,-1.708 5.046,-1.032 l 3.613,-3.611 c 0.737,-0.74 0.738,-1.937 -0.004,-2.68 l -20.087,-20.075 c -0.742,-0.74 -1.94,-0.738 -2.681,0 l -3.606,3.612 c 0.672,1.683 0.329,3.682 -1.032,5.047 -1.367,1.365 -3.364,1.707 -5.048,1.032 l -2.359,2.36 c -0.74,0.738 -0.742,1.939 -10e-4,2.68 L -6.073,7.41 c 0.739,0.74 1.936,0.741 2.678,-0.002 L -1.033,5.046 C -1.71,3.364 -1.364,1.367 0,0"/></g><g transform="translate(30.8506,25.2313)" id="g24"><path id="path26" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1.881,-1.881 C 2.619,-2.622 2.619,-3.82 1.88,-4.557 l -17.411,-17.401 c -0.741,-0.741 -1.941,-0.741 -2.682,-0.002 l -1.878,1.883 c 0.504,1.893 0.021,3.995 -1.467,5.482 -1.484,1.485 -3.586,1.972 -5.483,1.467 l -0.541,0.541 c -0.738,0.742 -0.736,1.941 0.003,2.68 l 17.407,17.402 c 0.737,0.737 1.938,0.737 2.678,0.003 l 0.541,-0.546 c -0.506,-1.893 -0.019,-4 1.47,-5.484 C -3.998,-0.021 -1.895,-0.503 0,0"/></g></g></g><g id="g28"><g clip-path="url(#clipPath32)" id="g30"><g transform="translate(5.2368,20.5179)" id="g36"><path id="path38" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1.429,-1.437 13.65,-16.432 15.08,-14.996 0,0 Z"/></g><g transform="translate(16.8022,32.1253)" id="g40"><path id="path42" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.429,-1.438 15.083,-14.996 1.429,1.439 L 0,0 Z"/></g></g></g><g id="g44"><g clip-path="url(#clipPath48)" id="g46"><g transform="translate(20.9307,20.8856)" id="g52"><path id="path54" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.238,2.228 -5.369,2.708 -6.994,1.078 -8.618,-0.556 -8.119,-3.686 -5.88,-5.914 -3.641,-8.14 -0.506,-8.624 1.121,-6.989 2.745,-5.356 2.245,-2.228 0,0"/></g></g></g></g></svg>