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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f470-1f3fb.svg b/public/emoji/1f470-1f3fb.svg
index cb221eee1..b1eeedb6d 100644
--- a/public/emoji/1f470-1f3fb.svg
+++ b/public/emoji/1f470-1f3fb.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="M50,10.8c-7-5.5-29-5.5-36,0C3.6,19,2,62,2,62h60C62,62,60.4,19,50,10.8z" fill="#cedbd5"/><path d="m54.3 39c.3-.7.5-1.4.5-2.2 0-1.5-.6-2.8-1.5-3.8 1.4-1 2.3-2.6 2.3-4.5 0-2-1-3.7-2.5-4.7.6-.9.9-1.9.9-3.1 0-.2 0-.4 0-.5l-1.4-3.7.3-2.7c-2.3-6.6-8.5-11.8-20.9-11.8-12.4 0-18.6 5.2-20.9 11.7l.3 2.7-1.4 3.7c0 .2 0 .3 0 .5 0 1.1.3 2.2.9 3.1-1.5 1-2.5 2.7-2.5 4.7 0 1.9.9 3.6 2.3 4.5-.9 1-1.5 2.3-1.5 3.8 0 .8.2 1.6.5 2.2-2 .7-2.7 2.8-2.7 5.2 0 10.1 11 5.7 11 5.7h28c0 0 11 4.5 11-5.7 0-2.4-.6-4.4-2.7-5.1" fill="#594640"/><g fill="#f2f1f0"><path d="m54.3 62c0-14.7-1.4-15.5-22.3-15.5-20.8 0-22.3.8-22.3 15.5h44.6"/><path d="m32 6.6c-7.8 0-15.1 2.7-20.9 7.1-.7 2-1 4.2-1.1 6.4 5.6-5.8 13.3-9.4 22-9.4 8.6 0 16.4 3.6 22 9.4 0-2.2-.4-4.3-1.1-6.4-5.8-4.4-13.1-7.1-20.9-7.1"/></g><path d="m15.4 36.2c0 0-3.4-.9-3.4-5.8 0-3.9 2.5-4.6 2.5-4.6 9.1 0 25.9-11.7 25.9-11.7s3.5 10.3 8.9 11.7c0 0 2.6.5 2.6 4.6 0 4.9-3.5 5.8-3.5 5.8 0 7.4-10.3 16.4-16.5 16.4-6.1 0-16.5-9-16.5-16.4" fill="#ffe1bd"/><path d="m32 41.1c-3.2 0-4.8-2.3-3.2-2.3 1.6 0 4.8 0 6.4 0 1.6 0 0 2.3-3.2 2.3" fill="#e6b796"/><path d="m36.8 34.3c-1.1 0-1-1.4-1-1.4 1.7-8.8 11.5-4.1 11.5-4.1.8 1.5-1.8 5.3-2.5 5.5-3.1.8-8 0-8 0" fill="#f5f5f5"/><circle cx="41.2" cy="30.7" r="3.5" fill="#664e27"/><circle cx="41.2" cy="30.7" r="1.2" fill="#2b2925"/><path d="m35.8 32.9c1.7-10.5 10.4-3.5 13.8-5-3.4 3.2-10.3-3.8-13.8 5" fill="#3b3226"/><path d="m27.2 34.3c1.1 0 1-1.4 1-1.4-1.7-8.8-11.5-4.1-11.5-4.1-.8 1.5 1.8 5.3 2.5 5.5 3.1.8 8 0 8 0" fill="#f5f5f5"/><path d="m19.3 30.7c0 1.9 1.5 3.5 3.5 3.5 1.9 0 3.5-1.5 3.5-3.5 0-1.9-1.6-3.5-3.5-3.5-1.9 0-3.5 1.6-3.5 3.5" fill="#664e27"/><path d="m28.2 32.9c-1.7-10.5-10.4-3.5-13.8-5 3.4 3.2 10.3-3.8 13.8 5" fill="#3b3226"/><path d="m32 44.9l-7.7-1.2c4.6 6.6 10.8 6.6 15.4 0l-7.7 1.2" fill="#f085a9"/><path d="m35 43.5c-2.3-.9-3 .5-3 .5s-.8-1.4-3-.5c-1.8.7-4.7.3-4.7.3 3.1.7 3.5 1.9 7.7 1.9 4.2 0 4.6-1.3 7.7-1.9 0-.1-2.9.3-4.7-.3" fill="#d46c8f"/><circle cx="22.8" cy="30.7" r="1.2" fill="#2b2925"/><path fill="#428bc1" d="m39.9 62h-16.6l-2.2-3h20.1z"/><path d="m41.2 59c0 .4-4.5.8-10 .8-5.5 0-10-.4-10-.8 0-.4 4.5-.8 10-.8 5.5 0 10 .4 10 .8" fill="#224863"/><path fill="#871212" d="m25.6 54.3l-2-2.2-1.5 2.4z"/><path fill="#991d1d" d="m23 54.9l2-2.9 2.4 1.4z"/><path fill="#ad2727" d="m22.1 53l-.3 1.7 4.6.3z"/><path d="m25.4 55c2.9 1.4 2.6 3.2 1.1 3.9-1.5.7-3.8.1-4.2-1.8-.4-1.9-1.7-3-1.7-3s2.6-.2 4.8.9" fill="#cc3636"/><path d="m23.7 55.6c-1 3.1 1.5 3.9 3 3.2 1.5-.7 2-2.7 1.2-4.4-.8-1.7-1.6-2.5-1.6-2.5s-1.9 1.5-2.6 3.7" fill="#e24b4b"/><path d="m26.3 58.1c2.3-1.1 1.7.2.2 1-3.6 1.8-5-1.5-5-1.5s2.8 1.5 4.8.5" fill="#75a843"/><path d="m26.3 58.1c-.5.5-1.9 1.7-.3 1.3 3.1-.8 2.5-5.1 2.5-5.1s-.7 2.2-2.2 3.8" fill="#83bf4f"/><path fill="#871212" d="m35.9 52.8l4.2 2.6-.1-3.5z"/><path fill="#991d1d" d="m39.8 57.3l-2.8-4.1h4.7z"/><path fill="#ad2727" d="m40.7 55.8l-2.6-4.6-2.2 1.8z"/><path fill="#cc3636" d="m38.6 55.5l-4.5-.2 2-4.7z"/><path d="m36.8 54.4c-3.5 1.2-2.6 4.1-.9 4.9 1.7.8 3.8 0 4.8-2 1-1.9 2.1-2.8 2.1-2.8s-3.5-.9-6-.1" fill="#e24b4b"/><path d="m36.4 58.5c-.8-.1-2.8-.6-1.4.6 2.9 2.3 6.3-1.2 6.3-1.2s-2.4.8-4.9.6" fill="#83bf4f"/><path fill="#871212" d="m27.6 52.8l6.2-.3-3-2.7z"/><path fill="#991d1d" d="m35 51.8l-6 1.6 3.7-3.3z"/><path fill="#ad2727" d="m33 53.1l-4.5-2.6-.6 3.4z"/><path d="m32.2 54.2v5.5c-2.2.5-4.8-1.1-4.7-3.7.1-2.6-1.3-4.5-1.3-4.5s3.4.6 6 2.7" fill="#cc3636"/><path d="m29.7 54.5c-2.3 3.7.7 5.7 2.9 5.2s3.5-2.9 2.9-5.4c-.6-2.5-.2-4.2-.2-4.2s-3.9 1.7-5.6 4.4" fill="#e24b4b"/><path d="m32.4 58.6c3.3-.8 2.2.8 0 1.3-5.3 1.2-6.1-3.5-6.1-3.5s3.1 2.9 6.1 2.2" fill="#75a843"/><path d="m32.4 58.6c-.8.6-3 1.6-.8 1.6 4.4-.1 4.9-5.8 4.9-5.8s-1.7 2.5-4.1 4.2" 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(35,18.0005)" id="g20"><path id="path22" style="fill:#e6e7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,7.002 -2,13 -7,16 -5,3 -10,0.784 -10,0.784 l 0,-0.035 -0.001,0.035 c 0,0 -4.999,2.216 -9.999,-0.784 -5,-3 -7,-8.998 -7,-16 0,-7.003 -1,-18.001 -1,-18.001 l 18,0 18,0 C 1,-18.001 0,-7.003 0,0"/></g><g transform="translate(17.999,33.1909)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.876,0 13.001,-2.438 13.001,-13.001 0,-10.564 0,-13.001 -2.438,-13.001 -2.437,0 -5.687,2.437 -10.563,2.437 -4.876,0 -8.056,-2.437 -10.563,-2.437 -2.716,0 -2.438,9.751 -2.438,13.001 C -13.001,-2.438 -4.876,0 0,0"/></g><g transform="translate(32,0)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,1 c 0,3.314 -2.686,6 -6,6 l -16,0 c -3.313,0 -6,-2.686 -6,-6 l 0,-1 28,0 z"/></g><g transform="translate(27.75,20.5454)" id="g32"><path id="path34" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,6.928 -4.366,12.544 -9.751,12.544 -5.385,0 -9.75,-5.616 -9.75,-12.544 0,-5.581 2.834,-10.305 6.751,-11.934 l 0,-1.611 -3,0 0,-5 12,0 0,5 -3,0 0,1.613 C -2.834,-10.303 0,-5.58 0,0"/></g><g transform="translate(5.8633,16)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.025,0 -0.052,0.59 -0.052,0.876 0,4.063 2.437,-0.425 2.437,2.47 0,2.895 1.625,3.266 3.25,4.891 0.813,0.812 2.438,2.446 2.438,2.446 0,0 4.063,-2.434 7.314,-2.434 3.25,0 6.5,-1.624 6.5,-4.874 0,-3.25 2.437,1.563 2.437,-2.5 C 24.324,0.586 24.297,0 24.277,0 l 0.853,0 c 0.007,1 0.007,2.608 0.007,4.126 0,10.563 -8.125,14.658 -13.001,14.658 C 7.26,18.784 -0.865,14.674 -0.865,4.11 -0.865,3.169 -0.888,2 -0.855,0 L 0,0 Z"/></g><g transform="translate(14,18)" id="g40"><path id="path42" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.552,3 0,3 0.552,3 1,2.552 1,2 L 1,1 C 1,0.448 0.552,0 0,0"/></g><g transform="translate(22,18)" id="g44"><path id="path46" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.553,3 0,3 0.553,3 1,2.552 1,2 L 1,1 C 1,0.448 0.553,0 0,0"/></g><g transform="translate(27.6475,30.0396)" id="g48"><path id="path50" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.477,0.564 -0.982,1.079 -1.516,1.535 -2.957,1.196 -6.052,0.961 -9.648,0.961 c -3.591,0 -6.682,0.234 -8.125,0.572 -0.535,-0.456 -1.04,-0.971 -1.517,-1.534 1.871,-0.619 5.487,-1.038 9.642,-1.038 4.16,0 7.778,0.42 9.648,1.039"/></g><g transform="translate(19,15.5)" id="g52"><path id="path54" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.276 -0.224,-0.5 -0.5,-0.5 l -1,0 c -0.276,0 -0.5,0.224 -0.5,0.5 0,0.276 0.224,0.5 0.5,0.5 l 1,0 C -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(17.9951,12.2187)" id="g56"><path id="path58" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.13,0 1.817,0.469 2.349,0.812 2.88,1.156 3.817,0.523 3.005,-0.176 2.192,-0.875 0.952,-1.154 0.004,-1.154 L 0,0 Z"/></g><g transform="translate(17.9951,12.2187)" id="g60"><path id="path62" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.13,0 -1.817,0.469 -2.349,0.812 -0.531,0.344 -1.468,-0.289 -0.656,-0.988 0.813,-0.699 2.053,-0.978 3.001,-0.978 L 0,0 Z"/></g></g></g></g></svg>