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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f6f0.svg b/public/emoji/1f6f0.svg
index 1d11f7aa7..d3b7ec6d4 100644
--- a/public/emoji/1f6f0.svg
+++ b/public/emoji/1f6f0.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="m24.4 24.4c3.2-3.2 3.2-8.4 0-11.6l-11.6 11.6c3.2 3.2 8.4 3.2 11.6 0" fill="#d0d0d0"/><path d="m27 27c-4.3 4.3-4.3 4.3-6 2.6-1.7-1.7-1.7-1.7 2.6-6 4.3-4.3 4.3-4.3 6-2.6 1.7 1.7 1.7 1.7-2.6 6" fill="#94989b"/><path d="m37.2 37.2c-4.3 4.3-4.3 4.3-6 2.6-.4-.4-6.6-6.6-6.9-6.9-1.7-1.7-1.7-1.7 2.6-6 4.3-4.3 4.3-4.3 6-2.6.4.4 6.6 6.6 6.9 6.9 1.7 1.7 1.7 1.7-2.6 6" fill="#7f8285"/><path d="m39.6 39.6c-3.2 3.2-3.2 3.2-4.5 1.9-1.3-1.3-1.3-1.3 1.9-4.5 3.2-3.2 3.2-3.2 4.5-1.9 1.3 1.2 1.3 1.2-1.9 4.5" fill="#646669"/><path d="m22.2 15l-7.1-1.3c0-.3-.1-.5-.3-.7-.4-.4-1.2-.4-1.6 0-.4.4-.4 1.2 0 1.6.2.2.4.3.6.3l1.4 7.2.8-.8h-.2l-1.2-6.5c.1-.1.2-.1.3-.2.1-.1.1-.1.1-.2l6.5 1.2v.2l.7-.8" fill="#94989b"/><g fill="#3e4347"><path transform="matrix(.7073-.7069.7069.7073-18.2947 29.8994)" d="m25.9 36.4h2.1v1.3h-2.1z"/><path transform="matrix(.7071-.7071.7071.7071-8.1867 34.0994)" d="m36 26.3h2.1v1.3h-2.1z"/></g><path d="m31.1 42.6c.2.2.2.5 0 .7l-18.6 18.6c-.2.2-.5.2-.7 0l-9.7-9.7c-.1-.2-.1-.5 0-.7l18.6-18.6c.2-.2.5-.2.7 0l9.7 9.7" fill="#428bc1" id="0"/><use xlink:href="#0"/><path d="m61.9 11.9c.2.2.2.5 0 .7l-18.6 18.5c-.2.2-.5.2-.7 0l-9.7-9.7c-.2-.2-.2-.5 0-.7l18.6-18.6c.2-.1.5-.1.6 0l9.8 9.8" fill="#428bc1"/><g fill="#42ade2"><path d="m3.3 51.8l.7.7h16.4l5.1-5.1h-17.8z"/><path d="m29.2 42.3h-16.4l-2.5 2.6h17.7l1.9-1.9z"/><path d="m34.1 21l.7.7h16.4l5.1-5.1h-17.8z"/><path d="m60 11.5h-16.4l-2.5 2.6h17.7l1.9-1.9z"/></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(10.6362,14.0498)" id="g12"><path id="path14" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2.122,2.122 8.485,12.729 10.606,10.607 0,0 Z"/></g><g id="g16"><g clip-path="url(#clipPath20)" id="g18"><g transform="translate(8.5146,6.2725)" id="g24"><path id="path26" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.781,-0.781 -2.047,-0.781 -2.828,0 l -4.95,4.949 c -0.781,0.781 -0.781,2.048 0,2.828 l 4.95,4.95 c 0.781,0.781 2.047,0.781 2.828,0 L 4.95,7.777 C 5.731,6.997 5.731,5.73 4.95,4.949 L 0,0 Z"/></g><g transform="translate(24.7773,22.5352)" id="g28"><path id="path30" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.78,-0.781 -2.047,-0.781 -2.827,0 l -4.95,4.95 c -0.781,0.781 -0.782,2.047 -10e-4,2.828 l 4.951,4.95 c 0.781,0.782 2.047,0.781 2.828,0 L 4.95,7.778 C 5.732,6.998 5.732,5.731 4.951,4.951 L 0,0 Z"/></g><g transform="translate(12.4038,25.7173)" id="g32"><path id="path34" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -0.707,2.122 -1.414,4.243 -1.862,5.584 -2.829,5.657 -3.536,4.95 -4.243,4.243 -5.657,2.829 -6.364,2.122 -7.071,1.415 -6.999,0.447 -5.657,0 c 2.121,-0.707 4.243,-1.414 4.243,-1.414 L 0,0 Z"/></g><g transform="translate(17.708,14.0508)" id="g36"><path id="path38" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.782,-0.781 -2.048,-0.781 -2.829,-0.001 L -9.9,7.07 c -0.781,0.782 -0.781,2.048 0,2.829 l 4.242,4.242 c 0.781,0.781 2.048,0.781 2.829,10e-4 L 4.242,7.07 C 5.022,6.29 5.022,5.023 4.241,4.241 L 0,0 Z"/></g><g transform="translate(21.0156,14.9453)" id="g40"><path id="path42" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.952,-1.953 -4.802,-2.27 -6.364,-0.708 -1.562,1.563 0.876,2.29 2.829,4.243 1.953,1.953 2.681,4.39 4.243,2.829 C 2.27,4.802 1.953,1.953 0,0"/></g><g transform="translate(27.96,15.8184)" id="g44"><path id="path46" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.12,2.122 -5.118,1.951 -7.071,0 -1.952,-1.954 -2.121,-4.95 0,-7.071 L 0,0 Z"/></g><g transform="translate(25.1318,12.9893)" id="g48"><path id="path50" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 2.121,-3.535 -1.414,-1.414 0,0 Z"/></g><g transform="translate(27.8135,8.8936)" id="g52"><path id="path54" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.391,-0.391 -1.023,-0.391 -1.414,0 -0.391,0.391 -0.391,1.023 0,1.414 0.391,0.391 1.023,0.391 1.414,0 C 0.391,1.023 0.391,0.391 0,0"/></g><g transform="translate(4.272,17.5854)" id="g56"><path id="path58" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1.414,1.415 9.192,-6.364 7.778,-7.778 0,0 Z"/></g><g transform="translate(26.1924,23.9497)" id="g60"><path id="path62" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1.414,-1.414 -9.192,6.364 -7.778,7.778 0,0 Z"/></g><g transform="translate(0.7368,14.0498)" id="g64"><path id="path66" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1.414,1.415 9.192,-6.363 7.777,-7.777 0,0 Z"/></g><g transform="translate(29.7275,27.4858)" id="g68"><path id="path70" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1.414,-1.415 -9.192,6.363 -7.777,7.777 0,0 Z"/></g><g transform="translate(8.3066,28.3989)" id="g72"><path id="path74" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.39,-0.39 -1.023,-0.39 -1.414,0 -0.391,0.391 -0.39,1.024 0,1.415 0.391,0.39 1.024,0.39 1.414,0 C 0.391,1.024 0.391,0.391 0,0"/></g><g transform="translate(23.6816,5.5693)" id="g76"><path id="path78" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.017 0.001,0.034 0.002,0.051 0.029,0.603 0.499,1.027 1.051,1 1.066,0.999 3.207,0.937 4.851,2.58 6.487,4.218 6.429,6.353 6.431,6.381 6.398,6.931 6.828,7.401 7.379,7.43 7.931,7.457 8.4,7.032 8.428,6.48 8.44,6.358 8.551,3.452 6.265,1.166 3.977,-1.121 1.073,-1.004 0.951,-0.998 0.416,-0.971 0,-0.529 0,0"/></g><g transform="translate(24.2383,2.0107)" id="g80"><path id="path82" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.109 0.018,0.221 0.057,0.33 0.238,0.852 0.809,1.126 1.33,0.943 1.437,0.909 4.207,0.051 7.294,3.139 c 3.127,3.126 2.414,6.126 2.382,6.252 -0.137,0.529 0.184,1.077 0.716,1.216 0.53,0.139 1.073,-0.172 1.216,-0.702 C 11.654,9.735 12.686,5.7 8.708,1.725 4.694,-2.291 0.832,-1.001 0.67,-0.943 0.258,-0.8 0,-0.413 0,0"/></g></g></g></g></svg>