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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f38f.svg b/public/emoji/1f38f.svg
index 8f1261b6c..51c1fbde8 100644
--- a/public/emoji/1f38f.svg
+++ b/public/emoji/1f38f.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"><path d="m16.3 21.6l-11.8-3.2 11.8-3.3.3 1-8.2 2.3 8.1 2.2z"/><path d="m16.3 46.1l-11.8-3.1 11.8-3.3.3 1-8.2 2.3 8.1 2.1z"/></g><g fill="#6adbc6"><path d="m58.1 18.2c0 0-9.3 9.8-20.8 9.8s-20.8-4.4-20.8-9.8c0-5.4 9.3-9.8 20.8-9.8s20.8 9.8 20.8 9.8"/><path d="m51.2 18.2c0-5.4 3.9-9.8 8.7-9.8 4.8 0-.4 9.8-.4 9.8s5.2 9.8.4 9.8c-4.8 0-8.7-4.4-8.7-9.8"/></g><path d="m16.7 14.6c-.9 0-1.7.8-1.7 1.9 0 1 .7 1.9 1.7 1.9-.9 0-1.7.8-1.7 1.9 0 1 .7 1.9 1.7 1.9.9 0 3-3.8 3-3.8s-2.1-3.8-3-3.8" fill="#428bc1"/><path d="m27.4 15.6c0 1.8-1.3 3.3-2.9 3.3-1.6 0-2.9-1.5-2.9-3.3s1.3-3.3 2.9-3.3c1.6 0 2.9 1.5 2.9 3.3" fill="#fff"/><ellipse cx="24.5" cy="15.6" rx="1.5" ry="1.7" fill="#231f20"/><g fill="#428bc1"><path d="m30.4 12.6c1.5 2.4 2 5.3 1.3 8.2-.6 2.5-2.2 4.5-4.2 5.7-.5.3-.1 1.2.5.9 2.2-1.3 3.9-3.6 4.6-6.3.8-3 .2-6.4-1.4-9-.4-.6-1.2 0-.8.5"/><path d="m35.5 26.6c2.2 0 3.9-2 3.9-4.4s-1.8-4.4-3.9-4.4c0 .3 0 .7 0 1 2.2 0 3.9-2 3.9-4.4 0-2.4-1.8-4.4-3.9-4.4-.6 0-.6 1 0 1 1.7 0 3 1.5 3 3.4 0 1.9-1.4 3.4-3 3.4-.6 0-.6 1 0 1 1.7 0 3 1.5 3 3.4 0 1.9-1.4 3.4-3 3.4-.5 0-.5 1 0 1"/><path d="m47 24c1.6 0 2.8-1.4 2.8-3.1 0-1.7-1.3-3.1-2.8-3.1 0 .3 0 .7 0 1 1.6 0 2.8-1.4 2.8-3.1 0-1.7-1.3-3.1-2.8-3.1-.6 0-.6 1 0 1 1 0 1.9.9 1.9 2.1 0 1.2-.9 2.1-1.9 2.1-.6 0-.6 1 0 1 1 0 1.9.9 1.9 2.1 0 1.2-.9 2.1-1.9 2.1-.6 0-.6 1 0 1"/><path d="m41.2 25.6c1.9 0 3.5-1.8 3.5-3.9 0-2.2-1.6-3.9-3.5-4 0 .3 0 .7 0 1 1.9 0 3.5-1.8 3.5-3.9 0-2.2-1.6-3.9-3.5-4-.6 0-.6 1 0 1 1.4 0 2.6 1.3 2.6 2.9s-1.2 2.9-2.6 2.9c-.6 0-.6 1 0 1 1.4 0 2.6 1.3 2.6 2.9 0 1.6-1.2 2.9-2.6 2.9-.6.2-.6 1.2 0 1.2"/></g><g fill="#ff717f"><path d="m58.1 42.8c0 0-9.3 9.8-20.8 9.8s-20.8-4.4-20.8-9.8c0-5.4 9.3-9.8 20.8-9.8s20.8 9.8 20.8 9.8"/><path d="m51.2 42.8c0-5.4 3.9-9.8 8.7-9.8 4.8 0-.4 9.8-.4 9.8s5.2 9.8.4 9.8c-4.8 0-8.7-4.4-8.7-9.8"/></g><path d="m16.7 39.2c-.9 0-1.7.8-1.7 1.9s.7 1.9 1.7 1.9c-.9 0-1.7.8-1.7 1.9 0 1 .7 1.9 1.7 1.9.9 0 3-3.8 3-3.8s-2.1-3.8-3-3.8" fill="#c94747"/><path d="m27.4 40.2c0 1.8-1.3 3.3-2.9 3.3-1.6 0-2.9-1.5-2.9-3.3 0-1.8 1.3-3.3 2.9-3.3 1.6 0 2.9 1.5 2.9 3.3" fill="#fff"/><ellipse cx="24.5" cy="40.2" rx="1.5" ry="1.7" fill="#231f20"/><g fill="#c94747"><path d="m30.4 37.2c1.5 2.4 2 5.3 1.3 8.2-.6 2.5-2.2 4.5-4.2 5.7-.5.3-.1 1.2.5.9 2.2-1.3 3.9-3.6 4.6-6.3.8-3 .2-6.4-1.4-9-.4-.6-1.2-.1-.8.5"/><path d="m35.5 51.1c2.2 0 3.9-2 3.9-4.4 0-2.5-1.8-4.4-3.9-4.4 0 .3 0 .7 0 1 2.2 0 3.9-2 3.9-4.4 0-2.4-1.8-4.4-3.9-4.4-.6 0-.6 1 0 1 1.7 0 3 1.5 3 3.4 0 1.9-1.4 3.4-3 3.4-.6 0-.6 1 0 1 1.7 0 3 1.5 3 3.4 0 1.9-1.4 3.4-3 3.4-.5 0-.5 1 0 1"/><path d="m47 48.5c1.6 0 2.8-1.4 2.8-3.1 0-1.7-1.3-3.1-2.8-3.1 0 .3 0 .7 0 1 1.6 0 2.8-1.4 2.8-3.1 0-1.7-1.3-3.1-2.8-3.1-.6 0-.6 1 0 1 1 0 1.9.9 1.9 2.1 0 1.2-.9 2.1-1.9 2.1-.6 0-.6 1 0 1 1 0 1.9.9 1.9 2.1 0 1.2-.9 2.1-1.9 2.1-.6 0-.6 1.1 0 1"/><path d="m41.2 50.1c1.9 0 3.5-1.8 3.5-4 0-2.2-1.6-3.9-3.5-3.9 0 .3 0 .7 0 1 1.9 0 3.5-1.8 3.5-3.9 0-2.2-1.6-3.9-3.5-4-.6 0-.6 1 0 1 1.4 0 2.6 1.3 2.6 2.9 0 1.6-1.2 2.9-2.6 2.9-.6 0-.6 1 0 1 1.4 0 2.6 1.3 2.6 2.9 0 1.6-1.2 2.9-2.6 2.9-.6.2-.6 1.3 0 1.2"/></g><path fill="#f2b200" d="m3.5 11.3h2.9v50.7h-2.9z"/><path fill="#ffce31" d="m4.9 12.6h.9v49.4h-.9z"/><path d="m7.9 11.3c0 1.8-1.3 3.3-2.9 3.3s-3-1.5-3-3.3 1.3-3.3 2.9-3.3 3 1.5 3 3.3" fill="#f2b200"/><path d="m6.4 10.5c0-.5-.3-.8-.7-.8-.4 0-.7.4-.7.8 0 .5.3.8.7.8.4 0 .7-.4.7-.8" fill="#ffce31"/></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="clipPath18" clipPathUnits="userSpaceOnUse"><path id="path20" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath50" clipPathUnits="userSpaceOnUse"><path id="path52" d="M 10,15 C 7.791,15 7,13.209 7,11 L 7,11 7,7 C 7,4.791 7.791,3 10,3 l 0,0 25,0 c 2.209,0 -4,3.791 -4,6 l 0,0 c 0,2.209 6.209,6 4,6 l 0,0 -25,0 z"/></clipPath><clipPath id="clipPath62" clipPathUnits="userSpaceOnUse"><path id="path64" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath90" clipPathUnits="userSpaceOnUse"><path id="path92" d="M 10,31 C 7.791,31 7,29.209 7,27 l 0,0 0,-4 c 0,-2.209 0.791,-4 3,-4 l 0,0 25,0 c 2.209,0 -4,3.791 -4,6 l 0,0 c 0,2.209 6.209,6 4,6 l 0,0 -25,0 z"/></clipPath></defs><g transform="matrix(1.25,0,0,-1.25,0,45)" id="g10"><path id="path12" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3,0 2.001,0 0,33 L 3,33 3,0 Z"/><g id="g14"><g clip-path="url(#clipPath18)" id="g16"><g transform="translate(7,33)" id="g22"><path id="path24" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.343,-3 -3,-3 -1.657,0 -3,1.343 -3,3 0,1.657 1.343,3 3,3 1.657,0 3,-1.343 3,-3"/></g><g transform="translate(9,8)" id="g26"><path id="path28" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L 0,2 C 0.552,2 1,1.553 1,1 1,0.447 0.552,0 0,0"/></g><g transform="translate(27,14)" id="g30"><path id="path32" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.656 -2.463,-3 -5.5,-3 -3.038,0 -5.5,1.344 -5.5,3 0,1.656 0.462,4 3.5,4 C -4.463,4 0,1.656 0,0"/></g><g transform="translate(31,9)" id="g34"><path id="path36" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 6.209,-6 4,-6 l -25,0 c -2.209,0 -3,1.791 -3,4 l 0,4 c 0,2.209 0.791,4 3,4 L 4,6 C 6.209,6 0,2.209 0,0"/></g><g transform="translate(15,11)" id="g38"><path id="path40" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.656 -1.343,-3 -3,-3 -1.657,0 -3,1.344 -3,3 0,1.656 1.343,3 3,3 1.657,0 3,-1.344 3,-3"/></g><g transform="translate(13,11.5)" id="g42"><path id="path44" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.828 -0.671,-1.5 -1.5,-1.5 -2.329,-1.5 -3,-0.828 -3,0 -3,0.828 -2.329,1.5 -1.5,1.5 -0.671,1.5 0,0.828 0,0"/></g></g></g><g id="g46"><g clip-path="url(#clipPath50)" id="g48"><g transform="translate(15,16)" id="g54"><path id="path56" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2,-2 7,-7 0,-14 4,-1 10,-1.458 16,-1 6,0.458 6,4.75 6,7.209 C 22,-5.334 28,0 21,1 14,2 0,0 0,0"/></g></g></g><g id="g58"><g clip-path="url(#clipPath62)" id="g60"><g transform="translate(9,24)" id="g66"><path id="path68" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5,0 c -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 L 0,2 C 0.552,2 1,1.552 1,1 1,0.448 0.552,0 0,0"/></g><g transform="translate(27,30)" id="g70"><path id="path72" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -2.463,-3 -5.5,-3 -3.038,0 -5.5,1.343 -5.5,3 0,1.657 0.462,4 3.5,4 C -4.463,4 0,1.657 0,0"/></g><g transform="translate(31,25)" id="g74"><path id="path76" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 6.209,-6 4,-6 l -25,0 c -2.209,0 -3,1.791 -3,4 l 0,4 c 0,2.209 0.791,4 3,4 L 4,6 C 6.209,6 0,2.209 0,0"/></g><g transform="translate(15,27)" id="g78"><path id="path80" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.343,-3 -3,-3 -1.657,0 -3,1.343 -3,3 0,1.657 1.343,3 3,3 1.657,0 3,-1.343 3,-3"/></g><g transform="translate(13,27.5)" id="g82"><path id="path84" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.829 -0.671,-1.5 -1.5,-1.5 -2.329,-1.5 -3,-0.829 -3,0 -3,0.829 -2.329,1.5 -1.5,1.5 -0.671,1.5 0,0.829 0,0"/></g></g></g><g id="g86"><g clip-path="url(#clipPath90)" id="g88"><g transform="translate(15,32)" id="g94"><path id="path96" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2,-2 7,-7 0,-14 4,-1 10,-1.458 16,-1 6,0.458 6,4.751 6,7.208 C 22,-5.333 28,0 21,1 14,2 0,0 0,0"/></g></g></g></g></svg>