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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f371.svg b/public/emoji/1f371.svg
index dbc80e5b3..da1195afa 100644
--- a/public/emoji/1f371.svg
+++ b/public/emoji/1f371.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="m62 55.6c0 .8-.6 1.4-1.4 1.4h-57.2c-.8 0-1.4-.6-1.4-1.4v-47.2c0-.8.6-1.4 1.4-1.4h57.2c.8 0 1.4.6 1.4 1.4v47.2" fill="#3e4347" id="0"/><use xlink:href="#0"/><g fill="#ff5760"><path d="m36.1 36.8c0-1.5-1.2-2.7-2.8-2.7h-24.4c-1.5 0-2.8 1.2-2.8 2.7v13.3c0 1.5 1.2 2.7 2.8 2.7h24.5c1.5 0 2.8-1.2 2.8-2.7-.1 0-.1-13.3-.1-13.3"/><path d="m23.7 13.9c0-1.5-1.2-2.7-2.8-2.7h-12c-1.5 0-2.8 1.2-2.8 2.7v13.3c0 1.5 1.2 2.7 2.8 2.7h12.1c1.5 0 2.8-1.2 2.8-2.7-.1 0-.1-13.3-.1-13.3"/><path d="m30.6 11.1c-1.5 0-2.8 1.2-2.8 2.7v13.3c0 1.5 1.2 2.7 2.8 2.7h24.5c1.5 0 2.8-1.2 2.8-2.7v-13.2c0-1.5-1.2-2.7-2.8-2.7h-24.5z"/></g><path d="m33.5 41.4c0-1.1-.9-2.1-2.1-2.1 1.1 0 2.1-.9 2.1-2.1 0-1.1-.9-2.1-2.1-2.1-1.1 0-2.1.9-2.1 2.1 0-1.1-.9-2.1-2.1-2.1-1.1 0-2.1.9-2.1 2.1 0-1.1-.9-2.1-2.1-2.1-1.1 0-2.1.9-2.1 2.1 0-1.1-.9-2.1-2.1-2.1s-1.8 1.1-1.8 2.2c0-1.1-.9-2.1-2.1-2.1-1.1 0-2.1.9-2.1 2.1 0-1.1-.9-2.1-2.1-2.1-1.1 0-2.1.9-2.1 2.1 0 1.1.9 2.1 2.1 2.1-1.1 0-2.1.9-2.1 2.1 0 1.1.9 2.1 2.1 2.1-1.1 0-2.1.9-2.1 2.1 0 1.1.9 2.1 2.1 2.1-1.1 0-2.1.9-2.1 2.1 0 1.1.9 2.1 2.1 2.1 1.1 0 2.1-.9 2.1-2.1 0 1.1.9 2.1 2.1 2.1 1.1 0 2.1-.9 2.1-2.1 0 1.1.9 2.1 2.1 2.1s2.1-.9 2.1-2.1c0 1.1.9 2.1 2.1 2.1 1.1 0 2.1-.9 2.1-2.1 0 1.1.9 2.1 2.1 2.1 1.1 0 2.1-.9 2.1-2.1 0 1.1.9 2.1 2.1 2.1 1.1 0 2.1-.9 2.1-2.1 0-1.1-.9-2.1-2.1-2.1 1.1 0 2.1-.9 2.1-2.1 0-1.1-.9-2.1-2.1-2.1.9-.1 1.8-1.1 1.8-2.2" fill="#fff"/><circle cx="21.1" cy="43.5" r="2.1" fill="#ff5760"/><ellipse cx="14.9" cy="20.5" rx="8" ry="8" fill="#3e4347"/><ellipse cx="14.9" cy="20.5" rx="6.4" ry="6.4" fill="#c94747"/><path d="m57.1 19.8c0-.4-.6-.6-.7-.9.1-.4.5-.5.6-.8.2-.4-.4-.7-.6-1-.3-.4.3-.9 0-1.3-.2-.4-.8-.2-1.1-.5-.3-.3-.1-.9-.5-1.1-.4-.2-.8.2-1.2.1-.4-.1-.6-.9-1.1-.7-.3.2-.5.7-1 .7-.3 0-.9-.4-1.1 0-.2.3-.1.9-.5 1-.4.2-1.1.1-.9.7.1.4.3.8-.1 1.1-.3.3-.7.6-.3 1 .2.2.7.5.5.8-.3.3-.9.6-.5 1.1.2.2.7.5.5.9-.2.3-.8.6-.6 1 .1.2.7.5.6.9-.1.4-.9.6-.6 1.1.2.3.7.5.7 1 0 .3-.4.9 0 1.1.3.2.9.1 1.1.5.2.4.1 1.1.7.9.4-.1.8-.3 1.1.1.3.3.6.7 1 .3.3-.3.5-.6 1-.5.5.1.9.2 1-.4.1-.5.3-.7.8-.8.5-.1.6-.3.5-.8-.2-.5-.1-.7.3-1.1.5-.5.3-.7-.2-1.1-.7-.7.9-1 .3-1.7-.2-.2-.6-.4-.5-.7.2-.4.8-.5.8-.9" fill="#dae3ea"/><g fill="#839391"><path d="m50.3 16.7c.2-.4 0-1 .4-1.2.3-.2.9.2 1.1.1.4-.2.6-.7 1.1-.7.4 0 .7.7 1 .7.4 0 .8-.3 1.2 0 .4.2.2.9.4 1.2-.3-.3-.3-.7-.6-1-.2-.1-.8.3-1.1.2-.4-.1-.6-.7-.9-.7-.1 0-.6.6-.8.7-.4.1-.8-.2-1.2-.2-.3.1-.3.7-.6.9"/><path d="m50.3 20.7c.2-.4 0-1 .4-1.2.3-.2.9.2 1.1.1.4-.2.6-.8 1.1-.7.4 0 .7.7 1 .7.4 0 .8-.3 1.2 0 .4.2.2.9.4 1.2-.3-.3-.3-.7-.6-1-.2-.1-.8.3-1.1.2-.4-.1-.6-.7-.9-.7-.1 0-.6.6-.8.7-.4.1-.8-.2-1.2-.2-.3.1-.3.7-.6.9"/><path d="m50.3 18.7c.2-.4 0-1 .4-1.2.3-.2.9.2 1.1.1.4-.2.6-.7 1.1-.7.4 0 .7.7 1 .7.4 0 .8-.3 1.2 0 .4.2.2.9.4 1.2-.3-.3-.3-.7-.6-1-.2-.1-.8.3-1.1.2-.4-.1-.6-.7-.9-.7-.1 0-.6.6-.8.7-.4.1-.8-.2-1.2-.2-.3.1-.3.7-.6.9"/></g><g fill="#fc97b2"><path d="m55.3 24.4c0 0 0 0 0 0"/><path d="m55.3 24.4c0 0 0 .1 0 0"/><path d="m55.3 24.5c0 .1 0 .1 0 0"/><path d="m51.6 24.7c-.9-1.1-.3-3.1 1.3-2.9 1.3.2 1.7 2.4.3 2.2-.6-.1-1-.9-.3-1.2.6-.3.7.4.7.8.8-.6-.4-1.6-1.1-1-.7.5-.4 1.5.3 1.9 1.9 1 3-2.5.8-3-2-.5-3.2 2.1-2.1 3.6 1.1 1.5 3.5 1.1 4.1-.7-.6.3-.9 1-1.7 1.1-1.1.1-1.8-.2-2.3-.8"/></g><path d="m55.3 24.5c0 0 0 0 0 0" fill="#fc97b2" id="1"/><use xlink:href="#1"/><g fill="#83bf4f"><path d="m45.4 18c-4.2-1.3-8.7-1.3-13 0-1.7.6-3-2.4-.9-3.1 4.8-1.5 10-1.5 14.8 0 2.1.7.8 3.7-.9 3.1"/><path d="m45.4 22.6c-4.2-1.3-8.7-1.3-13 0-1.7.6-3-2.4-.9-3.1 4.8-1.5 10-1.5 14.8 0 2.1.7.8 3.7-.9 3.1"/><path d="m45.4 27.2c-4.2-1.3-8.7-1.3-13 0-1.7.6-3-2.4-.9-3.1 4.8-1.5 10-1.5 14.8 0 2.1.7.8 3.7-.9 3.1"/></g><path d="m43 34.1c-1.5 0-2.8 1.2-2.8 2.7v13.3c0 1.5 1.2 2.7 2.8 2.7h12.1c1.5 0 2.8-1.2 2.8-2.7v-13.3c0-1.5-1.2-2.7-2.8-2.7 0 0-12.1 0-12.1 0" fill="#ff5760"/><path d="m54.8 37.1c0-1.1-1.3-1.8-1.9-1.9-.5-.1-1.6.1-1.9.3-.3-.2-1.4-.5-1.9-.5-.5 0-1.8.3-2.1.5-.3-.2-1.3-.3-1.8-.3-.7.1-1.9.9-1.9 1.9-1.1 0-1.9.9-1.9 1.9s.9 1.9 1.9 1.9c0 1.1 1.3 1.8 1.9 1.9.4.1 1.5-.1 1.8-.3.3.2 1.5.3 2.1.3.5 0 1.7-.2 1.9-.3.3.2 1.4.3 1.9.3.7-.1 1.9-.9 1.9-1.9 1.1 0 1.9-.9 1.9-1.9s-.8-1.9-1.9-1.9" fill="#fbbf67"/><g fill="#89664c"><path d="m51.6 36.5h1v5h-1z"/><path d="m45.6 36.5h1v5h-1z"/><path d="m48.6 36.5h1v5h-1z"/></g><path d="m54.8 46.1c0-1.1-1.3-1.8-1.9-1.9-.5-.1-1.6.1-1.9.3-.3-.2-1.4-.5-1.9-.5-.5 0-1.8.3-2.1.5-.3-.2-1.3-.3-1.8-.3-.7.1-1.9.9-1.9 1.9-1.1 0-1.9.9-1.9 1.9s.9 1.9 1.9 1.9c0 1.1 1.3 1.8 1.9 1.9.4.1 1.5-.1 1.8-.3.3.2 1.5.3 2.1.3.5 0 1.7-.2 1.9-.3.3.2 1.4.3 1.9.3.7-.1 1.9-.9 1.9-1.9 1.1 0 1.9-.9 1.9-1.9s-.8-1.9-1.9-1.9" fill="#fbbf67"/><g fill="#89664c"><path d="m51.6 45.5h1v5h-1z"/><path d="m45.6 45.5h1v5h-1z"/><path d="m48.6 45.5h1v5h-1z"/></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></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,36)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -26,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-6 0,-16 0,-6 c 0,-2.209 1.791,-4 4,-4 l 26,0 c 2.209,0 4,1.791 4,4 l 0,6 0,16 0,6 C 4,-1.791 2.209,0 0,0"/></g><g transform="translate(14,25)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -1,0 c -2.209,0 -4,1.791 -4,4 l 0,2 c 0,2.209 1.791,4 4,4 l 1,0 C -1.791,6 0,4.209 0,2 L 0,0 Z"/></g><g transform="translate(22,9)" id="g28"><path id="path30" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -15,0 c -1.104,0 -2,0.896 -2,2 l 0,8 c 0,1.105 0.896,2 2,2 l 15,0 C -0.895,10 0,9.105 0,8 L 0,0 Z"/></g><g transform="translate(33,17)" id="g32"><path id="path34" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.105 -0.895,2 -2,2 L -7,2 C -8.104,2 -9,1.105 -9,0 l 0,-8 c 0,-1.104 0.896,-2 2,-2 l 5,0 c 1.105,0 2,0.896 2,2 l 0,8 z"/></g><g transform="translate(16,32)" id="g36"><path id="path38" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.104 0.896,2 2,2 l 13,0 c 1.105,0 2,-0.896 2,-2 l 0,-9 c 0,-1.104 -0.895,-2 -2,-2 l -13,0 c -1.104,0 -2,0.896 -2,2 l 0,9 z"/></g><g transform="translate(14,23)" id="g40"><path id="path42" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -7,0 c -1.104,0 -2,0.896 -2,2 l 0,9 c 0,1.104 0.896,2 2,2 l 7,0 c 1.105,0 2,-0.896 2,-2 L 0,0 Z"/></g><g transform="translate(14,23)" id="g44"><path id="path46" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -7,0 c -1.104,0 -2,0.896 -2,2 l 0,6 c 0,1.104 0.896,2 2,2 l 7,0 C -0.895,8 0,7.104 0,6 L 0,0 Z"/></g><g transform="translate(33,23)" id="g48"><path id="path50" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -13,0 c -1.104,0 -2,0.896 -2,2 l 0,6 c 0,1.104 0.896,2 2,2 L -2,8 C -0.895,8 0,7.104 0,6 L 0,0 Z"/></g><g transform="translate(22,9)" id="g52"><path id="path54" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -15,0 c -1.104,0 -2,0.896 -2,2 l 0,5 c 0,1.105 0.896,2 2,2 L -2,7 C -0.895,7 0,6.105 0,5 L 0,0 Z"/></g><g transform="translate(33,9)" id="g56"><path id="path58" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -5,0 c -1.104,0 -2,0.896 -2,2 l 0,5 c 0,1.105 0.896,2 2,2 l 5,0 C -0.895,7 0,6.105 0,5 L 0,0 Z"/></g><g transform="translate(27.0146,26.7598)" id="g60"><path id="path62" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.315,-1.478 1.908,-3.098 1.322,-3.619 L 0.264,-4.56 c -0.585,-0.522 -2.126,0.255 -3.441,1.733 l -3.571,4.013 c -1.314,1.479 -1.907,3.099 -1.321,3.62 l 1.059,0.941 c 0.586,0.521 2.124,-0.255 3.439,-1.733 L 0,0 Z"/></g><g transform="translate(22.2803,24.9238)" id="g64"><path id="path66" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.598,-1.538 -1.477,-2.633 -1.961,-2.444 l -0.877,0.342 c -0.485,0.188 -0.392,1.588 0.205,3.125 l 1.625,4.178 c 0.599,1.538 1.477,2.633 1.962,2.444 L 1.83,7.304 C 2.315,7.115 2.224,5.715 1.625,4.177 L 0,0 Z"/></g><g transform="translate(23.1133,24.4639)" id="g68"><path id="path70" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.562,-0.535 -2.965,-0.568 -3.133,-0.076 l -0.305,0.891 c -0.168,0.492 0.962,1.324 2.523,1.858 l 4.242,1.45 C 4.889,4.656 6.291,4.69 6.46,4.197 L 6.764,3.308 C 6.933,2.815 5.803,1.983 4.241,1.45 L 0,0 Z"/></g><g transform="translate(6.4424,28.127)" id="g72"><path id="path74" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.373,4.106 4.907,0.961 7.135,-1.049 5.795,-2.534 -0.452,-4.979 0,0"/></g><g transform="translate(6.5845,28.2158)" id="g76"><path id="path78" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 3.739,1.737 3.293,-3.763 2.672,-6.698 0.716,-6.284 -4.534,-2.108 0,0"/></g><g transform="translate(5,28)" id="g80"><path id="path82" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.2,1.6 1,5 6,5 7,4 3,-4 0,0"/></g><g transform="translate(6,9)" id="g84"><path id="path86" style="fill:#b2c2cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.256,0 -0.512,0.098 -0.707,0.293 -0.391,0.391 -0.391,1.023 0,1.414 l 1,1 c 0.391,0.391 1.023,0.391 1.414,0 0.391,-0.391 0.391,-1.023 0,-1.414 l -1,-1 C 0.512,0.098 0.256,0 0,0"/></g><g transform="translate(18.417,8.501)" id="g88"><path id="path90" style="fill:#b2c2cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.256,0 -0.512,0.098 -0.707,0.293 l -1.001,1 c -0.39,0.391 -0.39,1.023 0,1.414 0.391,0.391 1.024,0.391 1.414,0 l 1.001,-1 C 1.098,1.316 1.098,0.684 0.707,0.293 0.512,0.098 0.256,0 0,0"/></g><g transform="translate(12.2505,12.792)" id="g92"><path id="path94" style="fill:#b2c2cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.255,0 -0.511,0.098 -0.707,0.292 L -1.165,0.75 c -0.391,0.391 -0.392,1.023 -0.002,1.414 0.389,0.392 1.023,0.392 1.414,0.002 L 0.706,1.708 C 1.097,1.317 1.098,0.685 0.708,0.294 0.513,0.098 0.256,0 0,0"/></g><g transform="translate(32.1494,12.5879)" id="g96"><path id="path98" style="fill:#b26304;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.707,-0.848 0.592,-2.109 -0.257,-2.816 l -2.304,-1.921 c -0.848,-0.707 -2.11,-0.592 -2.817,0.257 l -1.921,2.304 c -0.707,0.848 -0.592,2.11 0.257,2.817 l 2.305,1.92 c 0.847,0.707 2.109,0.592 2.816,-0.256 L 0,0 Z"/></g><g transform="translate(32.1494,14.5879)" id="g100"><path id="path102" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.707,-0.848 0.592,-2.109 -0.257,-2.816 l -2.304,-1.921 c -0.848,-0.707 -2.11,-0.592 -2.817,0.257 l -1.921,2.304 c -0.707,0.848 -0.592,2.11 0.257,2.817 l 2.305,1.92 c 0.847,0.707 2.109,0.592 2.816,-0.256 L 0,0 Z"/></g><g transform="translate(13,10)" id="g104"><path id="path106" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.448,-1 -1,-1 -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 0.552,0 1,-0.447 1,-1"/></g><g transform="translate(21,14)" id="g108"><path id="path110" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 0.553,0 1,-0.447 1,-1"/></g></g></g></g></svg>