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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f6f4.svg b/public/emoji/1f6f4.svg
index a0f4a49ab..d23b8a077 100644
--- a/public/emoji/1f6f4.svg
+++ b/public/emoji/1f6f4.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" enable-background="new 0 0 64 64"><g fill="#3e4347"><ellipse cx="9.5" cy="7" rx="2.3" ry="4"/><path d="m2.9 5h4.7v4h-4.7z"/><ellipse cx="2.9" cy="7" rx=".9" ry="2"/></g><ellipse cx="9.5" cy="7" rx=".9" ry="2" fill="#83bf4f"/><ellipse cx="55.4" cy="54" rx="6.6" ry="7" fill="#3e4347"/><path fill="#83bf4f" d="m9.5 5h13.1v4h-13.1z"/><g fill="#3e4347"><ellipse cx="21.7" cy="7" rx="2.3" ry="4"/><path d="m22.6 5h6.6v4h-6.6z"/></g><ellipse cx="29.2" cy="7" rx="1.4" ry="2" fill="#94989b"/><path d="m28.3 52c0 0-1.7-8-9.4-8-2.7 0-4.4-1.8-5.2-3.1-.4-.7-1.7-2.9-1.7-2.9l-3.2 2 9 16h37.6v-4c0 0-16.3 0-27.1 0" fill="#83bf4f"/><path d="m58.7 54c0 1.9-1.5 3.5-3.3 3.5s-3.3-1.6-3.3-3.5 1.5-3.5 3.3-3.5 3.3 1.6 3.3 3.5" fill="#d0d0d0"/><path d="m55.4 46.5c3.1 0 5.6-.5 5.6-1.1-1.6-1.2-3.5-1.9-5.6-1.9-5.4 0-9.8 4.7-9.8 10.5h2.8c0-4.1 3.2-7.5 7-7.5" fill="#83bf4f"/><ellipse cx="55.4" cy="54" rx="2.2" ry="2.3" fill="#fff"/><path d="m13.7 40.9c-.4-.7-1.7-2.9-1.7-2.9l-1.4.9-.6 3.5 2.9 5.2 1-6.1c0-.3-.1-.4-.2-.6" opacity=".5" fill="#3e4347"/><path d="m57.8 44.8c0 .3-3.4-.7-6.7 1.4-3.3 2-4.3 5.9-4.5 5.8-.3.1.4-4.4 4-6.7 3.7-2.4 7.4-.8 7.2-.5" fill="#c7e755"/><g fill="#3e4347"><path d="m6.6 47.2c.3-.1.6-.2.9-.2l.1-.8c.2-1.2.4-1.7 1.2-1.8s-1.5-.1-2.2 2.8" opacity=".5"/><path d="m9.5 47h-1.9c-2.6 0-4.7 3.1-4.7 7s2.1 7 4.7 7h1.9c2.6 0 4.7-3.1 4.7-7s-2.1-7-4.7-7"/></g><path d="m11.8 54c0 1.9-1 3.5-2.3 3.5s-2.3-1.6-2.3-3.5 1-3.5 2.3-3.5 2.3 1.6 2.3 3.5" fill="#d0d0d0"/><ellipse cx="9.5" cy="54" rx="1.6" ry="2.3" fill="#fff"/><g opacity=".25"><path d="m5 54c0 3.9 2.7 6.3 2.8 6 .2-.2-2-2.5-1.9-6-.1-3.5 2.1-5.8 1.9-6-.1-.3-2.8 2.1-2.8 6" fill="#fff"/></g><path d="m11.4 42.1l6-37.1h-3.8l-5.8 36.6c-1.4.6-2.2 2.1-2.5 4.1l-.5 2.8c.7-.9 1.7-1.5 2.7-1.5l.1-.8c.2-1.4.5-2 1.8-1.7.5.1.5 1.2.2 2.6l-1.1 6.5c0 0 0 0 0 0-.1.7.3 1.4 1 1.5.7.1 1.3-.4 1.4-1.1l1.1-6.5c.6-2.2.7-4.4-.6-5.4" fill="#83bf4f"/><g fill="#c7e755"><path d="m9.9 43.6c.8-.3 1.6.8.9 4.5s-.9 2.7-.3-1.8c.4-2.7-1.1-2.5-.6-2.7"/><path d="m11.8 25.6c-1.5 8.9-2.8 16.1-3.1 16.1-.2 0 .8-7.3 2.3-16.2 1.5-8.9 2.8-16.1 3.1-16.1.2 0-.9 7.3-2.3 16.2"/><ellipse cx="14.2" cy="6.2" rx="4.7" ry=".5"/></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></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(9,4.5)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-2.485 -2.015,-4.5 -4.5,-4.5 -6.985,-4.5 -9,-2.485 -9,0 -9,2.485 -6.985,4.5 -4.5,4.5 -2.015,4.5 0,2.485 0,0"/></g><g transform="translate(1.5,4.5)" id="g24"><path id="path26" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.657 1.343,3 3,3 4.657,3 6,1.657 6,0 6,-1.657 4.657,-3 3,-3 1.343,-3 0,-1.657 0,0"/></g><g transform="translate(36,4.5)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-2.485 -2.015,-4.5 -4.5,-4.5 -6.985,-4.5 -9,-2.485 -9,0 -9,2.485 -6.985,4.5 -4.5,4.5 -2.015,4.5 0,2.485 0,0"/></g><g transform="translate(28.5,4.5)" id="g32"><path id="path34" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.657 1.343,3 3,3 4.657,3 6,1.657 6,0 6,-1.657 4.657,-3 3,-3 1.343,-3 0,-1.657 0,0"/></g><g transform="translate(31.5,3)" id="g36"><path id="path38" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -20,0 c -0.825,0 -1.5,0.675 -1.5,1.5 0,0.825 0.675,1.5 1.5,1.5 L 0,3 C 0.825,3 1.5,2.325 1.5,1.5 1.5,0.675 0.825,0 0,0"/></g><g transform="translate(26.0124,4.2539)" id="g40"><path id="path42" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.004,0.082 -0.012,0.163 -0.012,0.246 0,3.038 2.462,5.5 5.5,5.5 1.21,0 2.325,-0.396 3.234,-1.058 l 0.89,1.205 C 8.454,6.74 7.032,7.246 5.488,7.246 c -3.866,0 -7,-3.134 -7,-7 0,-0.102 0.01,-0.201 0.015,-0.302 C -1,-0.038 -0.497,-0.019 0,0"/></g><g transform="translate(5.6287,9.8831)" id="g44"><path id="path46" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2.495,-0.52 4.369,-2.73 4.371,-5.378 l 3.5,-0.004 c 0,4.341 -3.074,7.962 -7.163,8.81 C 0.476,2.298 0.232,1.119 0,0"/></g><g transform="translate(4.3951,4.0023)" id="g48"><path id="path50" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,0 C -0.269,0.057 -0.442,0.324 -0.385,0.593 L 5.617,28.831 C 5.674,29.1 5.941,29.273 6.21,29.216 6.479,29.159 6.652,28.892 6.595,28.623 L 0.593,0.385 C 0.536,0.116 0.269,-0.057 0,0"/></g><g transform="translate(6.1235,9.7393)" id="g52"><path id="path54" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.978,0.208 c -0.538,0.114 -0.885,0.648 -0.77,1.186 l 1.247,5.869 c 0.114,0.538 0.648,0.884 1.186,0.77 L 1.663,7.825 C 2.201,7.711 2.548,7.177 2.434,6.639 L 1.186,0.77 C 1.072,0.232 0.538,-0.114 0,0"/></g><g transform="translate(9.2995,31.6764)" id="g56"><path id="path58" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1.956,0.416 C -2.763,0.587 -3.283,1.388 -3.112,2.195 -2.94,3.002 -2.14,3.522 -1.333,3.35 L 0.624,2.934 C 1.431,2.763 1.951,1.962 1.779,1.155 1.608,0.348 0.807,-0.172 0,0"/></g><g transform="translate(10.8404,34.3248)" id="g60"><path id="path62" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.807,0.172 -1.608,-0.348 -1.779,-1.155 l -1.352,-6.358 c -0.114,-0.538 0.233,-1.072 0.771,-1.186 l 0.978,-0.208 c 0.538,-0.115 1.072,0.232 1.186,0.77 l 1.351,6.358 C 1.327,-0.972 0.807,-0.172 0,0"/></g><g transform="translate(14.1053,30.6549)" id="g64"><path id="path66" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2.934,0.624 C -3.741,0.795 -4.261,1.596 -4.09,2.403 -3.918,3.21 -3.118,3.73 -2.311,3.558 L 0.624,2.934 C 1.431,2.763 1.951,1.962 1.779,1.155 1.608,0.348 0.807,-0.172 0,0"/></g><g transform="translate(15.9034,31.8062)" id="g68"><path id="path70" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.172,-0.81 -0.969,-1.328 -1.779,-1.155 -0.81,0.172 -1.328,0.968 -1.155,1.779 0.172,0.81 0.968,1.327 1.779,1.155 C -0.345,1.607 0.172,0.81 0,0"/></g><g transform="translate(35.93,9.5397)" id="g72"><path id="path74" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.409 -0.331,-0.74 -0.74,-0.74 -0.409,0 -0.74,0.331 -0.74,0.74 0,0.409 0.331,0.74 0.74,0.74 C -0.331,0.74 0,0.409 0,0"/></g></g></g></g></svg>