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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f3dc.svg b/public/emoji/1f3dc.svg
index f95f15ea7..5dd33f2b9 100644
--- a/public/emoji/1f3dc.svg
+++ b/public/emoji/1f3dc.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" enable-background="new 0 0 64 64"><path fill="#b4d7ee" d="m0 0h64v64h-64z"/><path d="m64 27c0 0-11.9-3-16-3s-10.8 3-16 3c-4.3 0-11.7-4-16-4-4.8 0-16 1-16 1v25h64v-22" fill="#f9f3d9"/><path d="M0,34.7c0,0,16-5.7,32-5.7c8,0,32,7.5,32,7.5V64H0V34.7z" fill="#ffdd7d"/><path d="m0 47.8c0 0 6.9-2.8 11-2.8s16.9 6.9 21 6.6c4.3-.3 19.7-3.7 24-3.8 4.2-.1 8 .9 8 .9v15.3h-64v-16.2" fill="#dbb471"/><g fill="#699635"><path d="m21.2 35.5c0 1.1.9 1.9 1.9 1.9 1.1 0 1.9-.9 1.9-1.9v-7.7c0-1.1-.9-1.9-1.9-1.9-1.1 0-1.9.9-1.9 1.9v7.7"/><path d="m15.5 33.6c-1.1 0-1.9.9-1.9 1.9 0 1.1.9 1.9 1.9 1.9h7.7c1.1 0 1.9-.9 1.9-1.9 0-1.1-.9-1.9-1.9-1.9h-7.7"/></g><path d="m15.8 17c-1.6 0-2.9 1.3-2.9 2.9v32.2c0 2.9 1.3 2.9 2.9 2.9s2.9 0 2.9-2.9v-32.2c0-1.6-1.3-2.9-2.9-2.9" fill="#83bf4f"/><g fill="#699635"><path d="m10.1 42c0 .8-.6 1.4-1.4 1.4-.8 0-1.4-.6-1.4-1.4v-5.8c0-.8.6-1.4 1.4-1.4.8 0 1.4.6 1.4 1.4v5.8"/><path d="m14.4 40.6c.8 0 1.4.6 1.4 1.4 0 .8-.6 1.4-1.4 1.4h-5.7c-.8 0-1.4-.6-1.4-1.4 0-.8.6-1.4 1.4-1.4h5.7"/></g><path d="m3 52.5c0 1.1 1.3 1 3 1s3 .1 3-1-1.3-2-3-2-3 .9-3 2" fill="#f9f3d9"/><path d="m16.3 60.1c0 1.1 1.3 1 3 1s3 .1 3-1-1.3-2-3-2-3 .9-3 2" fill="#ffdd7d"/><g fill="#89664c"><path d="m26 56.5c0 1.1 1.3 1 3 1s3 .1 3-1-1.3-2-3-2-3 .9-3 2"/><path d="m57.3 52.3c-2.7.8-5.4.3-8.2.5-.2-.6-.4-1.2-.7-1.8-.3-.7-1.4-.4-1.1.3.2.5.4 1.1.6 1.6-.4.1-.9.1-1.3.3-1.4.4-2.9.8-4.3 1.3 1.3-1.3 2.7-2.5 4.3-3.5.9-.5 2-.8 3.2-.9 0 0 .1 0 .1 0 .6-.1 1.3-.1 1.9-.1.5.7 1 1.4 1.5 2.1.4.6 1.5 0 1-.6-.3-.5-.7-.9-1-1.4 1 0 1.9.1 2.7.1.8 0 .8-1.2 0-1.2-1.5 0-3.3-.2-5-.1.3-.5.7-1 1-1.4.4-.6-.6-1.3-1-.6-.5.7-1 1.4-1.5 2.2-1.1.1-2.2.4-3.1.8-1.8.9-3.4 2.3-4.9 3.8 1-2 2.2-3.9 3.9-5 3.3-2 6.7-3.1 10.4-2.4.7.1 1.1-1.1.3-1.2-3.7-.7-6.5.3-9.8 1.8.2-.4.5-.9.7-1.3.4-.7-.6-1.3-1-.6-.5 1-1.1 2-1.6 3-1.7 1.2-2.8 3.1-3.8 5 .3-2.1.7-4.2 1.9-5.6 1.6-2 3.4-3.2 5.4-3.9.7.5 1.5 1 2.2 1.5.6.4 1.2-.6.6-1.1-.4-.3-.9-.6-1.3-.9 1.1-.3 2.3-.4 3.6-.4.8 0 .8-1.2 0-1.2-1.6 0-3.4 0-4.9.5-2.3.7-4.2 2.5-5.9 4.2-2.4 2.4-2.7 6.4-3 9.8-.3.1-.5.2-.8.3-.7.2-.4 1.4.3 1.2.4-.1.8-.3 1.2-.4 2.7 2.2 4.6 2.7 8.1 2.4 3.6-.3 5.7-.9 8.4-3.4.6-.5-.3-1.4-.8-.9-1 1-2 1.6-3 2.1-.4-.6-.8-1.2-1.1-1.9-.4-.7-1.4 0-1 .6.3.5.7 1.1 1 1.7-1 .3-2.1.4-3.4.6-.6 0-1.2.1-1.9.1.4-.7.7-1.3 1.1-2 .4-.7-.6-1.3-1-.6-.5.9-.9 1.7-1.4 2.6-.6-.1-1.1-.2-1.6-.5-.7-.4-1.3-.8-1.9-1.3 1.9-.6 3.7-1.2 5.6-1.7 3.5-1 7.1.2 10.7-.8.6-.7.3-1.9-.4-1.7"/></g><path d="m46 11c0 3.3 2.7 6 6 6s6-2.7 6-6c0-3.3-2.7-6-6-6s-6 2.7-6 6" fill="#ffce31"/><g fill="#fff"><path d="m47.8 2.9c-2.5 1.4-4.2 3.6-4.5 6.6-.1.4.6.6.6.2.4-2.9 1.9-4.9 4.2-6.2.4-.2.1-.8-.3-.6"/><path d="m59.9 13.2c-.9 3.2-2.6 5.5-5.6 6.5-.4.1-.2.8.2.7 3.2-1 5.2-3.6 6.1-7 0-.4-.6-.6-.7-.2"/><path d="m44.2 13c.5 2.9 1.7 4.9 4.1 6.4.4.2.7-.4.3-.6-2.2-1.5-3.3-3.3-3.8-6-.1-.4-.7-.2-.6.2"/><path d="m58.6 6.1c-1-1.7-3-3.8-5.1-3.6-.4 0-.4.7 0 .7 1.8-.2 3.6 1.8 4.5 3.3.3.4.8 0 .6-.4"/></g><g fill="#d6eef0"><path d="m50.8 21.3c-2.4 0-4.5-.8-6.3-2.5-.3-.3-.8.2-.5.5 2 1.8 4.1 2.7 6.7 2.7.5 0 .5-.7.1-.7"/><path d="m60.4 16.7c-.6 1.5-1.7 3.5-3.2 4.2-.4.2-.2.8.2.7 1.7-.7 2.9-2.8 3.6-4.5.1-.4-.4-.8-.6-.4"/><path d="m43.2 4c-2.3 2.3-1.9 7-.7 9.8.2.4.7.1.6-.3-1.1-2.5-1.5-6.9.6-8.9.2-.4-.2-.9-.5-.6"/><path d="m58.2 2.6c1.8 1.8 2.6 3.9 2.7 6.5 0 .4.6.4.6 0 0-2.8-.9-5.1-2.9-7-.3-.3-.7.2-.4.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><clipPath id="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="M 4,36 C 4,36 0,36 0,32 L 0,32 0,4 C 0,0 4,0 4,0 l 0,0 28,0 c 4,0 4,4 4,4 l 0,0 0,28 c 0,0 0,4 -4,4 l 0,0 -28,0 z"/></clipPath><clipPath id="clipPath40" clipPathUnits="userSpaceOnUse"><path id="path42" d="M 0,17.072 0,4 C 0,0 4,0 4,0 l 0,0 28,0 c 4,0 4,4 4,4 l 0,0 0,11 -8,0 c -1.418,0 -7.792,5 -9,5 l 0,0 c -1,0 -4,-2 -5,-2 l 0,0 c -2,0 -4.348,4 -6,4 l 0,0 C 6.215,22 2.849,18.384 0,17.072"/></clipPath><clipPath id="clipPath52" clipPathUnits="userSpaceOnUse"><path id="path54" 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(36,4)" id="g20"><path id="path22" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0,-4 -4,-4 l -28,0 c 0,0 -4,0 -4,4 l 0,28 c 0,4 4,4 4,4 l 28,0 c 4,0 4,-4 4,-4 L 0,0 Z"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g transform="translate(8,22)" id="g32"><path id="path34" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.653,0 4,-4 6,-4 1,0 4,2 5,2 1.208,0 7.582,-5 9,-5 l 8,0 c 2.004,0 0,-21 0,-21 l -36,0 c 0,0 -7.454,21.096 -1,22.709 C -5.982,-4.537 -2,0 0,0"/></g></g></g><g id="g36"><g clip-path="url(#clipPath40)" id="g38"><g transform="translate(-1.9585,15)" id="g44"><path id="path46" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 37.999,0 0.959,-20 -38,0 L 0,0 Z"/></g></g></g><g id="g48"><g clip-path="url(#clipPath52)" id="g50"><g transform="translate(31.5,21.4653)" id="g56"><path id="path58" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.398,0 -2.5,-1.135 -2.5,-2.535 l 0,-5.782 c 0,-0.687 -1,-1.241 -1,-1.551 l 0,10.601 c 0,2.1 -1.9,3.802 -4,3.802 -2.1,0 -4,-1.702 -4,-3.802 l 0,-13.171 c -1,0.301 -1,0.869 -1,1.587 l 0,3.247 c 0,1.4 -1.101,2.535 -2.5,2.535 -1.399,0 -2.5,-1.135 -2.5,-2.535 l 0,-4.436 c 0,-1.399 0.94,-2.455 1.971,-3.048 0.787,-0.455 3.029,-1.014 4.029,-1.047 l 0,-2.33 c 0,-2 8,-2 8,0 l 0,4.873 c 1,0.075 3.185,0.603 3.937,1.038 1.03,0.594 2.063,1.649 2.063,3.05 l 0,6.969 C 2.5,-1.135 1.4,0 0,0"/></g><g transform="translate(20.6035,20.1982)" id="g60"><path id="path62" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.35 -0.283,-0.634 -0.633,-0.634 -0.35,0 -0.635,0.284 -0.635,0.634 0,0.35 0.285,0.633 0.635,0.633 C -0.283,0.633 0,0.35 0,0"/></g><g transform="translate(27.5742,24.0991)" id="g64"><path id="path66" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.35 -0.283,-0.634 -0.634,-0.634 -0.35,0 -0.634,0.284 -0.634,0.634 0,0.35 0.284,0.634 0.634,0.634 C -0.283,0.634 0,0.35 0,0"/></g><g transform="translate(26.3066,18.2969)" id="g68"><path id="path70" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.35 -0.283,-0.634 -0.634,-0.634 -0.349,0 -0.633,0.284 -0.633,0.634 0,0.351 0.284,0.634 0.633,0.634 C -0.283,0.634 0,0.351 0,0"/></g><g transform="translate(21.8711,13.8613)" id="g72"><path id="path74" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.35 -0.283,-0.634 -0.634,-0.634 -0.35,0 -0.634,0.284 -0.634,0.634 0,0.351 0.284,0.634 0.634,0.634 C -0.283,0.634 0,0.351 0,0"/></g><g transform="translate(25.6729,11.3271)" id="g76"><path id="path78" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.351 -0.283,-0.634 -0.634,-0.634 -0.349,0 -0.634,0.283 -0.634,0.634 0,0.35 0.285,0.634 0.634,0.634 C -0.283,0.634 0,0.35 0,0"/></g><g transform="translate(21.2373,7.5254)" id="g80"><path id="path82" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.351 -0.283,-0.634 -0.634,-0.634 -0.349,0 -0.633,0.283 -0.633,0.634 0,0.35 0.284,0.634 0.633,0.634 C -0.283,0.634 0,0.35 0,0"/></g><g transform="translate(16.1685,6.8916)" id="g84"><path id="path86" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.351 -0.284,-0.634 -0.634,-0.634 -0.35,0 -0.634,0.283 -0.634,0.634 0,0.35 0.284,0.634 0.634,0.634 C -0.284,0.634 0,0.35 0,0"/></g><g transform="translate(18.7031,11.3271)" id="g88"><path id="path90" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.351 -0.283,-0.634 -0.634,-0.634 -0.35,0 -0.634,0.283 -0.634,0.634 0,0.35 0.284,0.634 0.634,0.634 C -0.283,0.634 0,0.35 0,0"/></g><g transform="translate(14.2671,12.5947)" id="g92"><path id="path94" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.351 -0.283,-0.634 -0.633,-0.634 -0.351,0 -0.634,0.283 -0.634,0.634 0,0.35 0.283,0.633 0.634,0.633 C -0.283,0.633 0,0.35 0,0"/></g><g transform="translate(34.5439,18.9307)" id="g96"><path id="path98" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.351 -0.283,-0.634 -0.634,-0.634 -0.349,0 -0.634,0.283 -0.634,0.634 0,0.351 0.285,0.634 0.634,0.634 C -0.283,0.634 0,0.351 0,0"/></g><g transform="translate(30.7422,17.0303)" id="g100"><path id="path102" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.351 -0.283,-0.634 -0.634,-0.634 -0.349,0 -0.634,0.283 -0.634,0.634 0,0.35 0.285,0.633 0.634,0.633 C -0.283,0.633 0,0.35 0,0"/></g><g transform="translate(33.2764,13.8613)" id="g104"><path id="path106" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.35 -0.283,-0.634 -0.633,-0.634 -0.35,0 -0.634,0.284 -0.634,0.634 0,0.351 0.284,0.634 0.634,0.634 C -0.283,0.634 0,0.351 0,0"/></g><g transform="translate(31.376,8.792)" id="g108"><path id="path110" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.35 -0.283,-0.633 -0.634,-0.633 -0.35,0 -0.634,0.283 -0.634,0.633 0,0.351 0.284,0.634 0.634,0.634 C -0.283,0.634 0,0.351 0,0"/></g><g transform="translate(26.9404,4.9902)" id="g112"><path id="path114" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.35 -0.283,-0.634 -0.634,-0.634 -0.35,0 -0.634,0.284 -0.634,0.634 0,0.351 0.284,0.634 0.634,0.634 C -0.283,0.634 0,0.351 0,0"/></g><g transform="translate(17,29)" id="g116"><path id="path118" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.762 -2.238,-5 -5,-5 -2.762,0 -5,2.238 -5,5 0,2.762 2.238,5 5,5 2.762,0 5,-2.238 5,-5"/></g><g transform="translate(16,29)" id="g120"><path id="path122" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.79,-4 -4,-4 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 2.21,0 4,-1.791 4,-4"/></g></g></g></g></svg>