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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f1f5-1f1fe.svg b/public/emoji/1f1f5-1f1fe.svg
index 93e40d091..1853d28da 100644
--- a/public/emoji/1f1f5-1f1fe.svg
+++ b/public/emoji/1f1f5-1f1fe.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="M32,62c13.1,0,24.2-8.3,28.3-20H3.7C7.8,53.7,18.9,62,32,62z" fill="#428bc1"/><path d="M32,2C18.9,2,7.8,10.4,3.7,22h56.6C56.2,10.4,45.1,2,32,2z" fill="#ed4c5c"/><path d="M60.3,42c1.1-3.1,1.7-6.5,1.7-10s-0.6-6.9-1.7-10H3.7C2.6,25.1,2,28.5,2,32s0.6,6.9,1.7,10H60.3z" fill="#f9f9f9"/><path d="m32 41c-5 0-9-4-9-9s4-9 9-9 9 4 9 9-4 9-9 9m0-17.7c-4.8 0-8.7 3.9-8.7 8.7s3.9 8.7 8.7 8.7 8.7-3.9 8.7-8.7-3.9-8.7-8.7-8.7" fill="#3e4347"/><path d="m32 24.4c-4.2 0-7.6 3.4-7.6 7.6 0 4.2 3.4 7.6 7.6 7.6 4.2 0 7.6-3.4 7.6-7.6s-3.4-7.6-7.6-7.6m0 13.3c-3.1 0-5.7-2.6-5.7-5.7s2.6-5.7 5.7-5.7 5.7 2.6 5.7 5.7-2.6 5.7-5.7 5.7" fill="#ed4c5c"/><path d="M26,32c0-3.3,2.7-6,6-6s6,2.7,6,6h1.3c0-4-3.3-7.3-7.3-7.3S24.7,28,24.7,32H26z" fill="#ffce31"/><path d="m34.9 31.7c0 1.6-1.3 2.9-2.9 2.9-1.6 0-2.9-1.3-2.9-2.9s1.3-2.9 2.9-2.9c1.6 0 2.9 1.3 2.9 2.9" fill="#428bc1"/><path d="m33.6 33.6l-1.6-1.1-1.6 1.1.6-1.7-1.4-1.1h1.7l.6-1.7.6 1.7h1.7l-1.2 1.1.6 1.7" fill="#ffce31"/><path d="m29.4 29.5c0 0-.4-.1-.6-.1.2-.3.3-1 .3-1s-.6.3-.8.7c-.1-.2-.3-.5-.3-.5s-.3.3-.2.6c0 .3.4.7.4.7s.5.2.8.1c.2-.2.4-.5.4-.5" fill="#699635"/><path d="m28.9 30.3c0 0-.4 0-.6.1.1-.4 0-1 0-1s-.5.5-.6.8c-.2-.2-.5-.4-.5-.4s-.2.4-.1.6.6.6.6.6.6 0 .8-.1.4-.6.4-.6" fill="#83bf4f"/><path d="m28.6 31.2c0 0-.4.1-.6.2 0-.4-.2-1-.2-1s-.3.6-.3 1c-.2-.2-.5-.3-.5-.3s-.1.4.1.6c.2.2.7.4.7.4s.5-.1.7-.3c.2-.2.1-.6.1-.6" fill="#699635"/><path d="m28.6 32.2c0 0-.3.2-.5.4-.1-.4-.5-.9-.5-.9s-.2.6-.1 1c-.3-.1-.6-.1-.6-.1s0 .4.3.6c.2.2.8.2.8.2s.5-.3.6-.5 0-.7 0-.7" fill="#83bf4f"/><path d="m28.8 33.1c0 0-.3.3-.4.5-.2-.4-.7-.7-.7-.7s0 .6.2 1c-.3 0-.6 0-.6 0s.1.4.4.5c.3.1.8 0 .8 0s.4-.4.5-.7-.2-.6-.2-.6" fill="#699635"/><path d="m29.3 34c0 0-.2.3-.3.6-.3-.3-.9-.5-.9-.5s.2.6.4.9c-.3 0-.6.2-.6.2s.2.3.5.4c.3 0 .8-.2.8-.2s.3-.5.3-.8c.1-.4-.2-.6-.2-.6" fill="#83bf4f"/><path d="m29.9 34.7c0 0-.1.4-.1.6-.3-.2-1-.3-1-.3s.3.5.7.8c-.2.1-.5.3-.5.3s.3.3.6.2c.3 0 .7-.4.7-.4s.2-.5.1-.8c-.1-.2-.5-.4-.5-.4" fill="#699635"/><path d="m30.8 35.2c0 0 0 .4.1.6-.4-.1-1 0-1 0s.5.4.8.6c-.2.2-.4.4-.4.4s.4.2.6.1c.3-.1.6-.6.6-.6s0-.6-.1-.8c-.3-.2-.6-.3-.6-.3" fill="#83bf4f"/><path d="m34.6 29.5c0 0 .4-.1.6-.1-.2-.3-.3-1-.3-1s.6.3.8.7c.1-.2.3-.5.3-.5s.3.3.2.6c0 .3-.4.7-.4.7s-.5.1-.8 0c-.2-.1-.4-.4-.4-.4" fill="#699635"/><path d="m35.1 30.3c0 0 .4 0 .6.1-.1-.4 0-1 0-1s.5.5.6.8c.2-.2.5-.4.5-.4s.2.4.1.6-.7.6-.7.6-.6 0-.8-.1-.3-.6-.3-.6" fill="#83bf4f"/><path d="m35.4 31.2c0 0 .4.1.6.2 0-.4.2-1 .2-1s.3.6.3 1c.2-.2.5-.3.5-.3s.1.4-.1.6c-.2.2-.7.4-.7.4s-.5-.1-.7-.3c-.2-.2-.1-.6-.1-.6" fill="#699635"/><path d="m35.4 32.2c0 0 .3.2.5.4.1-.4.5-.9.5-.9s.2.6.1 1c.3-.1.6-.1.6-.1s0 .4-.3.6c-.2.2-.8.2-.8.2s-.5-.3-.6-.5c-.1-.3 0-.7 0-.7" fill="#83bf4f"/><path d="m35.2 33.1c0 0 .3.3.4.5.2-.4.7-.7.7-.7s0 .6-.2 1c.3 0 .6 0 .6 0s-.1.4-.4.5c-.3.1-.8 0-.8 0s-.4-.4-.5-.7.2-.6.2-.6" fill="#699635"/><path d="m34.7 34c0 0 .2.3.3.6.3-.3.9-.5.9-.5s-.2.6-.4.9c.3 0 .6.2.6.2s-.2.3-.5.4c-.3 0-.8-.2-.8-.2s-.3-.5-.3-.8c-.1-.4.2-.6.2-.6" fill="#83bf4f"/><path d="m34.1 34.7c0 0 .1.4.1.6.3-.2 1-.3 1-.3s-.3.5-.7.8c.2.1.5.3.5.3s-.3.3-.6.2c-.3 0-.7-.4-.7-.4s-.2-.5-.1-.8c.1-.2.5-.4.5-.4" fill="#699635"/><path d="m33.2 35.2c0 0 0 .4-.1.6.4-.1 1 0 1 0s-.5.4-.8.6c.2.2.4.4.4.4s-.4.2-.6.1c-.3-.1-.6-.6-.6-.6s0-.6.1-.8c.3-.2.6-.3.6-.3" fill="#83bf4f"/></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(0,9)" id="g20"><path id="path22" style="fill:#0038a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 1.791,-4 4,-4 l 28,0 c 2.209,0 4,1.791 4,4 L 36,4 0,4 0,0 Z"/></g><path id="path24" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,13 36,13 36,23 0,23 0,13 Z"/><g transform="translate(32,31)" id="g26"><path id="path28" style="fill:#d52b1e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -28,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-4 36,0 0,4 C 4,-1.791 2.209,0 0,0"/></g><g transform="translate(21.9998,18)" id="g30"><path id="path32" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 2.209,0 4,-1.791 4,-4"/></g><g transform="translate(21.7504,18)" id="g34"><path id="path36" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.071 -1.68,-3.75 -3.75,-3.75 -2.071,0 -3.75,1.679 -3.75,3.75 0,2.071 1.679,3.75 3.75,3.75 C -1.68,3.75 0,2.071 0,0"/></g><g transform="translate(21.2499,17.9998)" id="g38"><path id="path40" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.795 -1.455,-3.25 -3.25,-3.25 -1.795,0 -3.25,1.455 -3.25,3.25 0,1.795 1.455,3.25 3.25,3.25 C -1.455,3.25 0,1.795 0,0"/></g><g transform="translate(21.1256,17.9999)" id="g42"><path id="path44" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.726 -1.4,-3.126 -3.125,-3.126 -1.726,0 -3.125,1.4 -3.125,3.126 0,1.725 1.399,3.124 3.125,3.124 C -1.4,3.124 0,1.725 0,0"/></g><g transform="translate(21.1323,18.0204)" id="g46"><path id="path48" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.73 -1.402,3.132 -3.132,3.132 -4.863,3.132 -6.265,1.73 -6.265,0 c 0,-0.574 0.154,-1.111 0.423,-1.573 l 2.712,1.491 2.707,-1.491 C -0.154,-1.111 0,-0.574 0,0"/></g><g transform="translate(20.4998,18.0001)" id="g50"><path id="path52" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.381 -1.119,-2.5 -2.5,-2.5 -3.88,-2.5 -5,-1.381 -5,0 -5,1.381 -3.88,2.5 -2.5,2.5 -1.119,2.5 0,1.381 0,0"/></g><g transform="translate(20.4,18)" id="g54"><path id="path56" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.326 -1.074,2.4 -2.4,2.4 -1.326,0 -2.4,-1.074 -2.4,-2.4 0,-1.326 1.074,-2.4 2.4,-2.4 1.326,0 2.4,1.074 2.4,2.4"/></g><g transform="translate(18,18.8179)" id="g58"><path id="path60" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.184,-0.565 0.594,0 L 0.297,-0.915 0.48,-1.48 0,-1.131 -0.48,-1.48 l 0.183,0.565 -0.481,0.35 0.594,0 L 0,0 Z"/></g><g transform="translate(18.4971,19.4834)" id="g62"><path id="path64" style="fill:#007127;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.3,0.07 0.476,0.088 0.176,0.018 0.335,-0.387 0.545,-0.458 0.214,-0.071 0.212,-0.282 0.3,-0.528 0.088,-0.247 0.035,-0.3 0.035,-0.581 0,-0.282 0.159,-0.423 0.124,-0.635 C 1.444,-2.325 1.268,-2.378 1.163,-2.519 1.058,-2.66 1.145,-2.836 1.039,-2.941 0.934,-3.047 0.581,-3.029 0.458,-3.136 0.335,-3.241 0.106,-3.399 -0.053,-3.311 c -0.158,0.087 -0.493,0.123 -0.493,0.123 0,0 0.088,0.317 0.335,0.422 0.247,0.106 0.352,0.088 0.581,0.159 0.23,0.071 0.211,0.176 0.37,0.317 0.158,0.141 0.176,0.335 0.264,0.476 0.089,0.141 0.106,0.246 0.071,0.44 C 1.039,-1.18 0.969,-0.969 0.898,-0.792 0.828,-0.617 0.67,-0.405 0.563,-0.282 0.458,-0.159 0,0 0,0"/></g><g transform="translate(17.4053,19.3779)" id="g66"><path id="path68" style="fill:#007127;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.175,0.383 0,0.405 -0.705,0.088 -0.846,-0.546 -1.057,-0.616 -0.214,-0.072 -0.247,-0.423 -0.335,-0.67 -0.088,-0.246 -0.052,-0.299 -0.052,-0.581 0,-0.282 0.005,-0.335 0.04,-0.546 0.035,-0.212 0.083,-0.37 0.189,-0.512 0.105,-0.14 0.146,-0.21 0.252,-0.316 0.105,-0.105 0.311,-0.212 0.435,-0.317 0.123,-0.106 0.498,-0.141 0.657,-0.053 0.158,0.088 0.434,0.123 0.434,0.123 0,0 -0.117,0.212 -0.364,0.317 -0.246,0.106 -0.264,0.194 -0.493,0.264 -0.229,0.071 -0.211,0.177 -0.37,0.318 -0.158,0.141 -0.176,0.334 -0.264,0.475 -0.088,0.141 -0.041,0.176 -0.006,0.37 0.036,0.194 0.106,0.352 0.177,0.528 0.07,0.177 0.246,0.406 0.352,0.529 C -0.299,-0.159 0,0 0,0"/></g><g transform="translate(17.4229,16.1367)" id="g70"><path id="path72" style="fill:#007127;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.229,-0.158 0.528,0.053 0.81,-0.141 1.18,0 0.81,-0.265 0.546,-0.053 0.264,-0.247 -0.018,-0.088 0,0 Z"/></g></g></g></g></svg>