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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f6cb.svg b/public/emoji/1f6cb.svg
index a33ada16b..c452194bc 100644
--- a/public/emoji/1f6cb.svg
+++ b/public/emoji/1f6cb.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="m10.4 34.2h-1.2v-22.6c0-1.6.8-4.8 3.8-4.8v1.3c-2.6 0-2.6 3.3-2.6 3.5 0 0 0 22.6 0 22.6" fill="#666"/><path d="m21.6 7c-.5-.5-2.5-1.2-2.5-1.2l-1.6-5.1c-.2-.7-1.9-.8-3.9-.2-2 .6-3.4 1.7-3.2 2.4l1.7 5.3c0 0-1.3 2.3-1.4 3.1-.3 1.6.6 6.3.6 6.3l14-4.2c-.1-.1-2.3-5.2-3.7-6.4" fill="#94989b"/><path d="m12.1 8.1c.2-.6.7-1.2 1.3-1.6.6-.4 1.2-.7 1.8-.9.6-.2 1.3-.4 2-.4.7 0 1.4.1 2 .5-.6-.3-1.3-.4-1.9-.3-.7 0-1.3.2-1.9.4-.6.2-1.2.5-1.8.8-.7.4-1.2.9-1.5 1.5" fill="#3e4347"/><path d="m25.2 13.3c.4 1.4-2.5 3.5-6.3 4.6-3.9 1.2-7.3 1-7.6-.4-.4-1.4 2.5-3.5 6.3-4.6 3.8-1.2 7.3-1 7.6.4" fill="#ffe62e"/><path d="m22.9 12.1c-1.4-.1-3.3.1-5.3.7-2.1.6-4 1.6-5.1 2.5 1.4.1 3.3-.1 5.3-.7 2.2-.6 4-1.5 5.1-2.5" fill="#fff"/><path d="m59.3 40.7c0 1.1-.9 2-2 2h-50.6c-1.1 0-2-.9-2-2v-13c0-1.1.9-2 2-2h50.7c1.1 0 2 .9 2 2v13z" fill="#42ade2"/><g fill="#428bc1"><path d="m59.3 40.7c0 1.1-.9 2-2 2h-50.6c-1.1 0-2-.9-2-2v-13c0-1.1.9-2 2-2h50.7c1.1 0 2 .9 2 2v13z" opacity=".5"/><path d="m45 42.7h-40.3v-15.4c0 0 8 9.2 40.3 15.4"/></g><path d="m62.3 30.5c0-1.8-1.3-3.2-3-3.2-1.6 0-2.9 1.4-2.9 3.2v12.4c0 1.8 1.3 3.2 2.9 3.2 1.6 0 3-1.4 3-3.2v-12.4" fill="#42ade2"/><path d="m56.4 30.5v12.4c0 1.8 1.3 3.2 2.9 3.2 1.6 0 3-1.4 3-3.2 0 0-4.4 1.3-5.9-12.4" fill="#428bc1"/><path fill="#3e4347" d="m6.1 59.8h3.9v4.2h-3.9z"/><g fill="#428bc1"><path d="m45 59.8h-41c-2.2 0-4-1.9-4-4.3 0-2.4 1.8-4.3 4-4.3h41v8.6"/><path d="m45 51.2h-41c-2.2 0-4-1.9-4-4.3 0-2.4 1.8-4.3 4-4.3h41v8.6"/></g><path fill="#3e4347" d="m54 59.8h3.9v4.2h-3.9z"/><g fill="#428bc1"><path d="m19 51.2h41c2.2 0 4 1.9 4 4.3 0 2.4-1.8 4.3-4 4.3h-41v-8.6"/><path d="m19 42.7h41c2.2 0 4 1.9 4 4.3 0 2.4-1.8 4.3-4 4.3h-41v-8.6"/></g><path d="m7.6 30.5c0-1.8-1.3-3.2-2.9-3.2-1.6 0-2.9 1.4-2.9 3.2v12.4c0 1.8 1.3 3.2 2.9 3.2 1.6 0 2.9-1.4 2.9-3.2v-12.4" fill="#42ade2"/><path d="m1.7 30.5v12.4c0 1.8 1.3 3.2 2.9 3.2 1.6 0 2.9-1.4 2.9-3.2.1 0-4.3 1.3-5.8-12.4" fill="#428bc1"/><g fill="#42ade2"><path d="m.3 48.6c-.2-.5-.3-1.1-.3-1.6 0-2.4 1.8-4.3 4-4.3h41c0 0-39.2.9-44.7 5.9"/><path d="m.3 57.2c-.2-.5-.3-1.1-.3-1.7 0-2.4 1.8-4.3 4-4.3h41c0 0-39.2.9-44.7 6"/><path d="m63.7 45.3c.2.5.3 1.1.3 1.7 0 2.4-1.8 4.3-4 4.3h-41c0-.1 39.2-1 44.7-6"/><path d="m63.7 53.8c.2.5.3 1.1.3 1.7 0 2.4-1.8 4.3-4 4.3h-41c0 0 39.2-.9 44.7-6"/></g><path d="m60.4 26.2c0 0-2.9 2.5-3.4 3.8-1 2.8-.3 8.9 0 11.9.1.5.5 1.9.5 1.9s-3.4-.9-4.6-1.1c-2.3-.3-6.8.2-9.1 0-1-.1-4-.8-4-.8s2.6-1.2 3.1-2c1.6-2.5 1.9-8.9 2.1-11.9 0-.4 0-1.7 0-1.7s2.2.7 3 .8c2.2.2 6.8-.2 9-.4.8 0 3.4-.5 3.4-.5" fill="#c7e755"/><path d="m47.4 36.4c.4-1 1-2 1.6-2.8 0-.2-.1-.4-.2-.6-.1-.3-.2-.6-.4-.8-.3-.5-.9-.9-1.4-1.2.6.1 1.3.3 1.8.8.3.2.5.5.7.8 0 .1.1.2.1.2.8-.9 1.6-1.6 2.6-2.3 1-.7 2.2-1.2 3.4-1.5-2 1.4-3.9 2.9-5.5 4.8-.8.9-1.5 1.9-2.1 3-.6 1.1-1.1 2.2-1.5 3.5.2-1.4.5-2.7.9-3.9" fill="#9db730"/></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(31,6.5)" id="g20"><path id="path22" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.828 -0.672,-1.5 -1.5,-1.5 -2.328,-1.5 -3,-0.828 -3,0 l 0,24 c 0,0.829 0.672,1.5 1.5,1.5 C -0.672,25.5 0,24.829 0,24 L 0,0 Z"/></g><g transform="translate(34.8818,4)" id="g24"><path id="path26" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.037,0.164 0.062,0.33 0.062,0.5 0,1.933 -2.462,3.5 -5.499,3.5 -3.038,0 -5.501,-1.567 -5.501,-3.5 0,-0.17 0.026,-0.336 0.063,-0.5 L 0,0 Z"/></g><g transform="translate(35.9443,27)" id="g28"><path id="path30" style="fill:#fcab40;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.334,-1.125 -0.896,-2 -2,-2 l -9,0 c -1.105,0 -2.291,1 -2,2 l 2,7 c 0.25,1.083 0.895,2 2,2 l 5,0 c 1.104,0 1.75,-1.125 2,-2 L 0,0 Z"/></g><g transform="translate(29.0059,6.8994)" id="g32"><path id="path34" style="fill:#5d9040;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.215 -1.017,-2.199 -2.271,-2.199 l -20.439,0 c -1.254,0 -2.271,0.984 -2.271,2.199 l 0,9.9 c 0,1.215 1.017,2.201 2.271,2.201 l 10.735,0 9.704,0 C -1.017,12.101 0,11.115 0,9.9 L 0,0 Z"/></g><g transform="translate(27.5,4.7002)" id="g36"><path id="path38" style="fill:#3f7123;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.215 -0.985,-2.2 -2.2,-2.2 l -18.7,0 c -1.215,0 -2.2,0.985 -2.2,2.2 l 0,1.1 c 0,1.214 0.985,2.2 2.2,2.2 l 18.7,0 C -0.985,3.3 0,2.314 0,1.1 L 0,0 Z"/></g><g transform="translate(29,16.875)" id="g40"><path id="path42" style="fill:#5d9040;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.383 -5.589,-6.125 -12.484,-6.125 -6.895,0 -12.485,2.742 -12.485,6.125 0,3.382 5.59,6.125 12.485,6.125 C -5.589,6.125 0,3.382 0,0"/></g><g transform="translate(6.6001,12.3994)" id="g44"><path id="path46" style="fill:#78b159;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.822 -1.478,-3.3 -3.3,-3.3 -1.823,0 -3.3,1.478 -3.3,3.3 0,1.823 1.477,3.301 3.3,3.301 C -1.478,3.301 0,1.823 0,0"/></g><g transform="translate(6.6001,2.5)" id="g48"><path id="path50" style="fill:#78b159;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.215 -0.985,-2.2 -2.2,-2.2 -1.215,0 -2.2,0.985 -2.2,2.2 l 0,9.899 c 0,1.215 0.985,2.201 2.2,2.201 1.215,0 2.2,-0.986 2.2,-2.201 L 0,0 Z"/></g><g transform="translate(26.4004,12.3994)" id="g52"><path id="path54" style="fill:#78b159;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.822 1.477,-3.3 3.3,-3.3 5.121,-3.3 6.6,-1.822 6.6,0 6.6,1.823 5.121,3.301 3.3,3.301 1.477,3.301 0,1.823 0,0"/></g><g transform="translate(26.4004,2.5)" id="g56"><path id="path58" style="fill:#78b159;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.215 0.984,-2.2 2.199,-2.2 1.215,0 2.2,0.985 2.2,2.2 l 0,9.899 c 0,1.215 -0.985,2.201 -2.2,2.201 C 0.984,12.1 0,11.114 0,9.899 L 0,0 Z"/></g><g transform="translate(16.5,8)" id="g60"><path id="path62" style="fill:#78b159;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.215 -0.985,-2.2 -2.2,-2.2 l -5.5,0 c -1.215,0 -2.2,0.985 -2.2,2.2 0,1.215 0.985,2.2 2.2,2.2 l 5.5,0 C -0.985,2.2 0,1.215 0,0"/></g><g transform="translate(26.4004,8)" id="g64"><path id="path66" style="fill:#78b159;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.215 -0.985,-2.2 -2.2,-2.2 l -5.5,0 c -1.216,0 -2.2,0.985 -2.2,2.2 0,1.215 0.984,2.2 2.2,2.2 l 5.5,0 C -0.985,2.2 0,1.215 0,0"/></g><path id="path68" style="fill:#78b159;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 27,5 6,5 6,8 27,8 27,5 Z"/></g></g></g></svg>