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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f486-1f3ff.svg b/public/emoji/1f486-1f3ff.svg
index bf24cb068..3fb4f8420 100644
--- a/public/emoji/1f486-1f3ff.svg
+++ b/public/emoji/1f486-1f3ff.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 5.8c-13.7 0-21.2 8.5-21.2 19.6v28.5h42.4v-28.5c0-16.6-11.5-16.3-11.5-16.3s-.8-3.3-9.7-3.3" fill="#231f20"/><path d="m41.6 49.9v-6.7h-19.2v6.7c-12.1.3-14.6 2.2-14.6 12.1h48.3c.1-9.9-2.4-11.8-14.5-12.1" fill="#b386e2"/><g fill="#8a6859"><path d="m16.9 34.7c0 0-3-.8-3-5.2 0-3.5 2.3-4.1 2.3-4.1 8.2 0 21.7-10.5 21.7-10.5s5.1 9.3 10 10.5c0 0 2.4.4 2.4 4.1 0 4.4-3.2 5.2-3.2 5.2 0 6.7-9.3 14.7-15 14.7-5.7 0-15.2-8-15.2-14.7"/><path d="m18.5 19.1c-.9-2.2-1.2-4-1.2-5.4 0-.5-.2-.9-.5-1.2l-4.2-6c-1.2-2-7.8-2.1-8 1.9l-.5 10.6c-.2 3.4 3.5 6.5 4.1 6.1l-.5 5.7c-.1 1.1.5 2 1.7 2.1 1.2.1 2.3-.8 2.3-1.8l1-14.2.9.8c0 0 .7 3.1 3 3.4 1.6.2 2.2-1.2 1.9-2"/></g><path d="m9 20.7c.1-1.1-.9-1.6-1-.5l-.3 3.7c-1.2-1.1-3-3.5-2.8-5.8l.8-10.6c.1-.8.4-1.4.8-1.9-1.1.5-1.9 1.4-2 2.7l-.8 10.7c-.3 3.7 3.2 6.4 3.9 6.9l-.3 5c-.1.9.6 1.8 1.6 2-.4-.4-.7-.9-.7-1.5l.8-10.7" fill="#705041"/><path d="m3.7 8.5c0 0 7.8.3 9.6-2.1l-.5-4.4h-9.8l.7 6.5" fill="#428bc1"/><path d="m14.5 18.5l-.1-.4c0 0-1.2-1.5-1.6-2.9l-.1 1.7c.3.5.6.9.6.9l.1.4c.2.8.8 2.5 3 2.8-1.3-.6-1.7-1.8-1.9-2.5" fill="#705041"/><path d="m45.5 19.1c.9-2.2 1.2-4 1.2-5.4 0-.5.2-.9.5-1.2l4.2-6c1.2-2 7.8-2.1 8 1.9l.5 10.6c.2 3.4-3.5 6.5-4.1 6.1l.5 5.7c.1 1.1-.5 2-1.7 2.1-1.2.1-2.3-.8-2.3-1.8l-1-14.2-.9.8c0 0-.7 3.1-3 3.4-1.6.2-2.2-1.2-1.9-2" fill="#8a6859"/><path d="m55 20.7c-.1-1.1.9-1.6 1-.5l.3 3.7c1.2-1.1 3-3.5 2.8-5.8l-.8-10.6c-.1-.8-.4-1.4-.8-1.9 1.1.5 2 1.4 2.1 2.8l.7 10.6c.3 3.7-3.2 6.4-3.9 6.9l.3 5c.1.9-.6 1.8-1.6 2 .4-.4.7-.9.7-1.5l-.8-10.7" fill="#705041"/><path d="m60.3 8.5c0 0-7.8.3-9.6-2.1l.5-4.4h9.8l-.7 6.5" fill="#428bc1"/><path d="m49.5 18.5l.1-.4c0 0 1.2-1.5 1.6-2.9l.1 1.7c-.3.5-.6.9-.6.9l-.1.4c-.2.8-.8 2.5-3 2.8 1.3-.6 1.7-1.8 1.9-2.5" fill="#705041"/><path d="m32 42.8l-7-1.1c4.2 6 9.8 6 14 0l-7 1.1" fill="#7d5442"/><path d="m34.8 41.5c-2.1-.8-2.8.5-2.8.5s-.7-1.2-2.8-.5c-1.6.6-4.2.2-4.2.3 2.8.6 3.1 1.8 7 1.8 3.8 0 4.2-1.2 7-1.8 0 0-2.6.3-4.2-.3" fill="#5c3f34"/><path d="m32 39.6c-2.9 0-4.4-2.1-2.9-2.1s4.4 0 5.9 0c1.4 0-.1 2.1-3 2.1" fill="#705041"/><g fill="#574137"><path d="m19.4 30.2c2.5 4.7 7.5 4.7 9.9 0 .1-.2-.2-.3-.6-.6-2.5 2-6.5 1.8-8.8 0-.3.3-.6.4-.5.6"/><path d="m34.7 30.2c2.5 4.7 7.5 4.7 9.9 0 .1-.2-.2-.3-.6-.6-2.5 2-6.5 1.8-8.8 0-.3.3-.6.4-.5.6"/></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(30.0006,16.3438)" id="g20"><path id="path22" style="fill:#0b0200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-6.627 -5.373,-12 -12,-12 -6.627,0 -12,5.373 -12,12 0,6.628 5.373,12 12,12 C -5.373,12 0,6.628 0,0"/></g><g transform="translate(20.0006,28)" id="g24"><path id="path26" style="fill:#0b0200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.866 -3.134,-7 -7,-7 -3.866,0 -7,3.134 -7,7 0,3.866 3.134,7 7,7 3.866,0 7,-3.134 7,-7"/></g><g transform="translate(8.0006,25)" id="g28"><path id="path30" style="fill:#0b0200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-6.075 4.925,-11 11,-11 6.075,0 11,4.925 11,11 C 22,6.075 17.075,11 11,11 4.925,11 0,6.075 0,0"/></g><g transform="translate(30.0006,16)" id="g32"><path id="path34" style="fill:#0b0200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -24,0 -24,12 0,9 0,0 Z"/></g><g transform="translate(27.0006,9)" id="g36"><path id="path38" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,0 -16,0 -1,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-5 5,0 16,0 5,0 0,5 C 4,-1.791 2.209,0 0,0"/></g><path id="path40" style="fill:#7450a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 27.001,0 -1,0 0,4 1,0 0,-4 z"/><path id="path42" style="fill:#7450a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 10.001,0 -1,0 0,4 1,0 0,-4 z"/><g transform="translate(15.0006,14)" id="g44"><path id="path46" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-6 c 0,-1.657 1.343,-3 3,-3 1.657,0 3,1.343 3,3 L 6,0 0,0 Z"/></g><g transform="translate(14.0006,31)" id="g48"><path id="path50" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -0.003,-5.308 -5,-5.936 L -5,-12 c 0,-4.971 4.029,-9 9,-9 4.971,0 9,4.029 9,9 l 0,5.019 C 1.89,-6.605 0,0 0,0"/></g><g transform="translate(20.0006,14)" id="g52"><path id="path54" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.896,-1 -2,-1 -1.105,0 -2,0.447 -2,1 0,0.553 0.895,1 2,1 1.104,0 2,-0.447 2,-1"/></g><g transform="translate(19.0006,16.5)" id="g56"><path id="path58" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2,0 C -2.276,0 -2.5,0.224 -2.5,0.5 -2.5,0.776 -2.276,1 -2,1 L 0,1 C 0.276,1 0.5,0.776 0.5,0.5 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(5.5611,30.9682)" id="g60"><path id="path62" style="fill:#583529;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 5.189,3.823 1.639,0.188 0,-2.839 3.004,-0.693 c 0.689,-0.161 1.119,-0.849 0.96,-1.538 -0.158,-0.69 -0.847,-1.12 -1.536,-0.961 L 5.168,-1.078 3.123,-3.123 C 2.781,-3.466 2.207,-3.786 1.605,-3.981 l -0.774,-6.38 c 0,0 0,-1 -0.999,-1 -0.999,0 -0.999,1 -0.999,1 l 0,7.995 L 0,0 Z"/></g><g transform="translate(5.1685,31.3608)" id="g64"><path id="path66" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 2.231,2.231 0.599,2.408 4.001,0 0,-3.467 3.001,-0.693 c 0.689,-0.161 1.119,-0.849 0.96,-1.538 -0.158,-0.69 -0.847,-1.12 -1.536,-0.961 L 5.168,-1.078 3.123,-3.123 C 2.781,-3.466 2.207,-3.786 1.605,-3.981 l -0.774,-6.38 c 0,0 0,-1 -0.999,-1 -0.999,0 -0.999,1 -0.999,1 l 0,7.995 L 0,0 Z"/></g><g transform="translate(30.4401,30.9682)" id="g68"><path id="path70" style="fill:#583529;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5.846,3.594 -0.982,0.417 0,-2.839 -3.004,-0.693 c -0.689,-0.161 -1.119,-0.849 -0.96,-1.538 0.158,-0.69 0.847,-1.12 1.536,-0.961 l 4.088,0.942 2.045,-2.045 c 0.342,-0.343 0.916,-0.663 1.518,-0.858 l 0.774,-6.38 c 0,0 0,-1 0.999,-1 0.999,0 0.999,1 0.999,1 l 0,7.995 L 0,0 Z"/></g><g transform="translate(30.8327,31.3608)" id="g72"><path id="path74" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2.231,2.231 -0.599,2.408 -3.998,0 0,-3.467 -3.004,-0.693 c -0.689,-0.161 -1.119,-0.849 -0.96,-1.538 0.158,-0.69 0.847,-1.12 1.536,-0.961 l 4.088,0.942 2.045,-2.045 c 0.342,-0.343 0.916,-0.663 1.518,-0.858 l 0.774,-6.38 c 0,0 0,-1 0.999,-1 0.999,0 0.999,1 0.999,1 l 0,7.995 L 0,0 Z"/></g><g transform="translate(23.9064,20.9441)" id="g76"><path id="path78" style="fill:#0b0200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.088,0.071 -0.213,0.074 -0.305,0.007 -0.006,-0.005 -0.631,-0.451 -1.851,-0.451 -1.221,0 -1.846,0.446 -1.85,0.45 -0.092,0.068 -0.217,0.066 -0.306,-0.005 -0.089,-0.071 -0.119,-0.193 -0.073,-0.297 0.03,-0.067 0.75,-1.648 2.229,-1.648 1.479,0 2.199,1.581 2.228,1.648 C 0.118,-0.192 0.088,-0.071 0,0"/></g><g transform="translate(16.4063,20.9441)" id="g80"><path id="path82" style="fill:#0b0200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.088,0.071 -0.213,0.074 -0.305,0.007 -0.006,-0.005 -0.631,-0.451 -1.851,-0.451 -1.221,0 -1.846,0.446 -1.85,0.45 -0.092,0.068 -0.217,0.066 -0.306,-0.005 -0.089,-0.071 -0.119,-0.193 -0.073,-0.297 0.03,-0.067 0.75,-1.648 2.229,-1.648 1.479,0 2.199,1.581 2.228,1.648 C 0.118,-0.192 0.088,-0.071 0,0"/></g></g></g></g></svg>