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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f68e.svg b/public/emoji/1f68e.svg
index ec3e927f8..bac04094a 100644
--- a/public/emoji/1f68e.svg
+++ b/public/emoji/1f68e.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="m62 37.6l-60 2v-16.1c0-2.6 2.1-4.7 4.7-4.7h50.6c2.6 0 4.7 2.1 4.7 4.7v14.1" fill="#c5d0d8"/><path d="m60.1 39.5h-56.2v-14c0-2.6 2.1-4.7 4.7-4.7h46.9c2.6 0 4.7 2.1 4.7 4.7l-.1 14" fill="#3e4347"/><path fill="#c5d0d8" d="m2 38.7v11.5h60v-13.6h-40.3z"/><path fill="#428bc1" d="m2 50.2h60v6.3h-60z"/><path fill="#fff" d="m2 46.2h60v2h-60z"/><g fill="#63686b"><path d="m49.6 46.2c-4.6 0-8.3 3.8-8.3 8.4 0 .6.1 1.2.2 1.8h16.2c.1-.6.2-1.2.2-1.8 0-4.6-3.7-8.4-8.3-8.4"/><path d="m18.5 46.2c-4.6 0-8.3 3.8-8.3 8.4 0 .6.1 1.2.2 1.8h16.2c.1-.6.2-1.2.2-1.8 0-4.6-3.7-8.4-8.3-8.4"/></g><path d="m49.6 47.3c-4 0-7.2 3.3-7.2 7.3 0 4.1 3.2 7.3 7.2 7.3 4 0 7.2-3.3 7.2-7.3 0-4-3.2-7.3-7.2-7.3" fill="#3e4347"/><ellipse cx="49.6" cy="54.6" rx="3.6" ry="3.7" fill="#94989b"/><path d="m18.5 47.3c-4 0-7.2 3.3-7.2 7.3 0 4.1 3.2 7.3 7.2 7.3 4 0 7.2-3.3 7.2-7.3.1-4-3.1-7.3-7.2-7.3" fill="#3e4347"/><path d="m18.5 51c-2 0-3.6 1.6-3.6 3.7 0 2 1.6 3.7 3.6 3.7 2 0 3.6-1.6 3.6-3.7.1-2.1-1.6-3.7-3.6-3.7" fill="#94989b"/><path fill="#3e4347" d="m8.4 39.6h-6.4v5.8l6.4-1.2z"/><g fill="#fff"><path d="m5.1 42.5c0 1.3-.8 2.3-1.9 2.3-.8 0-.8 0-.8-2.3 0-2.4 0-2.4.8-2.4 1 0 1.9 1.1 1.9 2.4"/><path d="m8 42.1c0 1.1-.7 2-1.6 2-.7 0-.7 0-.7-2s0-2 .7-2c.8 0 1.6.9 1.6 2"/></g><path fill="#3e4347" d="m2 52.2h4.8v2h-4.8z"/><path fill="#c5d0d8" d="m16.5 20.3h1.9v17.8h-1.9z"/><g fill="#3e4347"><path d="m15.6 20.8h.9v7.1h-.9z"/><path d="m18.4 20.8h.9v7.1h-.9z"/></g><path fill="#c5d0d8" d="m31.1 20.1h1.9v17.8h-1.9z"/><g fill="#3e4347"><path d="m30.1 20.8h.9v7.1h-.9z"/><path d="m32.9 20.8h.9v7.1h-.9z"/></g><path fill="#c5d0d8" d="m45.6 20.1h1.9v17.8h-1.9z"/><g fill="#3e4347"><path d="m44.7 20.8h.9v7.1h-.9z"/><path d="m47.5 20.8h.9v7.1h-.9z"/><path d="m25.4 15.1h13.1v3.8h-13.1z"/><path d="m2 2h60v1.9h-60z"/><path transform="matrix(.5237-.8519.8519.5237 5.7151 33.7079)" d="m27.9 11.3h10.3v.9h-10.3z"/><path transform="matrix(.524-.8517.8517.524 7.2275 39.3674)" d="m33.7 12.4h10.3v1.7h-10.3z"/><path transform="matrix(.7881-.6155.6155.7881 2.744 23.6406)" d="m35.3 2h.9v11.8h-.9z"/><path transform="matrix(.7879-.6158.6158.7879 4.3402 25.2133)" d="m37.9 1.8h1.8v9h-1.8z"/></g><path fill="#f15744" d="m62 45.6h-2.3v-2.8l2.3-.1z"/><path fill="#ffd45c" d="m59.7 39.9l2.3-1v3.9h-2.3z"/></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(0,14)" id="g20"><path id="path22" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-6 c 0,-1.657 1.343,-3 3,-3 l 30,0 c 1.657,0 3,1.343 3,3 L 36,0 0,0 Z"/></g><g transform="translate(15,23.9995)" id="g24"><path id="path26" style="fill:#6d6e71;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.226,0 -0.453,0.076 -0.64,0.232 -1.064,0.586 -1.121,1.216 -0.768,1.64 4.418,7.864 11.558,8.947 11.858,8.99 11.905,8.997 11.953,9.001 12,9.001 l 3,0 c 0.553,0 1,-0.448 1,-1 0,-0.553 -0.447,-1 -1,-1 l -2.919,0 C 11.392,6.882 5.203,5.682 0.769,0.36 0.571,0.123 0.287,0 0,0"/></g><path id="path28" style="fill:#a7a9ac;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 25,23 -14,0 0,4 14,0 0,-4 z"/><g transform="translate(36,14)" id="g30"><path id="path32" style="fill:#e6e7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,8 c 0,1.657 -1.343,3 -3,3 l -30,0 c -1.657,0 -3,-1.343 -3,-3 l 0,-8 36,0 z"/></g><path id="path34" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,12 -36,0 0,2 36,0 0,-2 z"/><g transform="translate(7.0005,11)" id="g36"><path id="path38" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -3.063,0 -5.586,-2.298 -5.95,-5.263 -5.425,-5.716 -4.749,-6 -4,-6 L 6,-6 C 6,-2.686 3.314,0 0,0"/></g><g transform="translate(34.9502,5.7373)" id="g40"><path id="path42" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.364,2.965 -2.887,5.263 -5.95,5.263 -3.314,0 -6,-2.687 -6,-6 l 10,0 c 0.749,0 1.425,0.284 1.95,0.737"/></g><g transform="translate(11,5)" id="g44"><path id="path46" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 2.209,0 4,-1.791 4,-4"/></g><g transform="translate(9,5)" id="g48"><path id="path50" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.896,-2 -2,-2 -1.104,0 -2,0.895 -2,2 0,1.105 0.896,2 2,2 1.104,0 2,-0.895 2,-2"/></g><g transform="translate(33,5)" id="g52"><path id="path54" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 2.209,0 4,-1.791 4,-4"/></g><g transform="translate(31,5)" id="g56"><path id="path58" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.895,-2 -2,-2 -1.104,0 -2,0.895 -2,2 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2"/></g><g transform="translate(27,17)" id="g60"><path id="path62" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -3,0 c -0.553,0 -1,0.447 -1,1 l 0,3 c 0,0.552 0.447,1 1,1 l 3,0 C -0.447,4 0,3.552 0,3 L 0,0 Z"/></g><g transform="translate(34,17)" id="g64"><path id="path66" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -3,0 c -0.553,0 -1,0.447 -1,1 l 0,3 c 0,0.552 0.447,1 1,1 l 3,0 C -0.447,4 0,3.552 0,3 L 0,0 Z"/></g><g transform="translate(13,17)" id="g68"><path id="path70" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.448,-1 -1,-1 l -3,0 c -0.552,0 -1,0.447 -1,1 l 0,3 c 0,0.552 0.448,1 1,1 l 3,0 C -0.448,4 0,3.552 0,3 L 0,0 Z"/></g><g transform="translate(20,17)" id="g72"><path id="path74" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -3,0 c -0.552,0 -1,0.447 -1,1 l 0,3 c 0,0.552 0.448,1 1,1 l 3,0 C -0.447,4 0,3.552 0,3 L 0,0 Z"/></g><g transform="translate(5,21)" id="g76"><path id="path78" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5,0 0,-7 5,0 c 0.552,0 1,0.447 1,1 l 0,5 C 1,-0.448 0.552,0 0,0"/></g><path id="path80" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 1,9 0,9 0,11 1,11 1,9 Z"/><path id="path82" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,9 -1,0 0,2 1,0 0,-2 z"/><path id="path84" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,14 -1,0 0,-2 1,0 0,2 z"/></g></g></g></svg>