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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f6b4.svg b/public/emoji/1f6b4.svg
index d66ad5c6c..68ec2c479 100644
--- a/public/emoji/1f6b4.svg
+++ b/public/emoji/1f6b4.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="#ffdd67" d="m26.1 16.1l2.1-2.6 3.9 9.3-6.1 2.5z"/><path d="m23.8 22.1c2.2.4 2.2 3.2 2.2 3.2 2.5-1 2.2-6.6.9-9.6l-3.1 6.4" fill="#eba352"/><path d="m22.8 3.2l-9.2 8.2c-.3 3.1 1.2 4 1.6 5.1.2.5-.4 1.8-.8 2.4-.7 1.5 1.5 1.5 2.2 1.1.9.9-.2 2.1 2.8.1 0 0-2.7 2.8-.1 2.4.3 1.4 1.1 4 6.8-1.4 1.7-1.6 1-5.4 1-5.4l3.1-2-7.4-10.5" fill="#ffdd67"/><path d="m14.8 5.4c6.1-5.3 11.5-3.2 12.9-1.9 3.6 3.6 4.1 9.1 2.3 14.1 0 0-1.8 0-2.9-1.9 0 0 2.1.1 1.3-4-.7-3.4-4.7-3.7-4.6 1.3l-.5.2c-1.8-1.8-1.3-5.2-4.1-5-2.5.2-5.6 3.8-5.6 3.8-1.3-1-1.3-4.4 1.2-6.6" fill="#ffb300"/><path d="m17.8 15.4c.3.7.1 1.4-.4 1.6-.5.2-.8-.3-1.1-1-.3-.7-.4-1.3.1-1.5.5-.1 1.1.2 1.4.9" fill="#937237"/><path d="m25 13.5c-.6-1.3.1-2.9 1.2-3.4 0 0-1.2 2.3.1 4.3 0 0-.9 0-1.3-.9" fill="#eba352"/><path d="m20.3 19.4c0 0-.9 1.5-1.3 2-.8.9-1 .6-.7 0 .3-.5 1-1.2 1-1.2l1-.8" fill="#937237"/><g fill="#3b946f"><path d="m26 24.3l-1.6 7.4 3.1.5.7-6.3z"/><path d="m27.5 31.8c-.2-.8-1-1.3-1.9-1.1l-6 1.4.7 3 6-1.4c.9-.2 1.4-1.1 1.2-1.9"/></g><path d="m20.4 33.5l-.2-1.5c-.1-.5-.6-.9-1.1-.8l-.7.1c-.4 0-.7.3-.8.7-1 .2-2.2.7-2 2.5 0 .3.2 1.9 2.2 1.7 2.9-.5 2.9-.5 2.6-2.7" fill="#eba352"/><path d="m30.9 49.4c-1.6.1-2.8 1.5-2.7 3.1l6.9-.5c.8-.1 1.4-.7 1.4-1.5l-.1-1.4-5.5.3" fill="#d3976e"/><g fill="#3e4347"><path d="m36.4 48.9l-5.5.5-.8-9.7 5.6-.4z"/><path d="m35.8 41.5l-5.7-1.8 5.4-6.8 6.5 1.2z"/></g><g fill="#333"><path d="m14.8 62c-1.6 0-3.1-.3-4.6-.9-1.4-.6-2.7-1.4-3.7-2.5s-2-2.3-2.6-3.6c-.6-1.5-.9-3-.9-4.5 0-1.6.3-3.1.9-4.5.6-1.4 1.4-2.6 2.5-3.7 1.1-1.1 2.3-1.9 3.7-2.5 1.5-.6 3-.9 4.6-.9s3.1.3 4.6.9c1.4.6 2.7 1.4 3.7 2.5 1.1 1.1 1.9 2.3 2.5 3.7.6 1.4.9 2.9.9 4.5 0 1.6-.3 3.1-.9 4.5-.6 1.4-1.4 2.6-2.5 3.7-1.1 1.1-2.3 1.9-3.7 2.5-1.4.5-2.9.8-4.5.8m0-21.1c-5.4 0-9.7 4.3-9.7 9.5 0 5.3 4.4 9.5 9.7 9.5s9.7-4.3 9.7-9.5c0-5.2-4.4-9.5-9.7-9.5"/><path d="m51.2 62c-1.6 0-3.1-.3-4.6-.9-1.4-.6-2.7-1.4-3.7-2.5-1.1-1.1-1.9-2.3-2.5-3.7-.6-1.4-.9-2.9-.9-4.5s.3-3.1.9-4.5c.6-1.4 1.4-2.6 2.5-3.7 1.1-1.1 2.3-1.9 3.7-2.5 1.5-.6 3-.9 4.6-.9s3.1.3 4.6.9c1.4.6 2.7 1.4 3.7 2.5 1.1 1.1 1.9 2.3 2.5 3.7.6 1.4.9 2.9.9 4.5 0 1.6-.3 3.1-.9 4.5-.6 1.4-1.4 2.6-2.5 3.7s-2.3 1.9-3.7 2.5c-1.4.6-3 .9-4.6.9m0-21.1c-5.4 0-9.7 4.3-9.7 9.5 0 5.3 4.4 9.5 9.7 9.5s9.7-4.3 9.7-9.5c.1-5.2-4.3-9.5-9.7-9.5"/></g><path d="m42.7 36.2l2.1-5.2-1.4-.5-2.1 5.1h-22.3l-2.2-2.3-1.1 1 2.6 2.7h3.4v2.8l13.9 13.5 6.3-15.3 8.6 12.7 1.4-.6-9.2-13.9m-7.5 14.5l-12.7-12.3.6-1.5h17.6l-5.5 13.8" fill="#ed4c5c"/><ellipse cx="51.2" cy="50.5" rx="2.4" ry="2.3" fill="#333"/><g fill="#94989b"><path d="m27.9 51.9h4v1.3h-4z"/><path d="m39.7 53.6h4v1.3h-4z"/></g><path fill="#b3b3b3" d="m31.7 52.3v.6l4 .5v-.6z"/><ellipse cx="35.7" cy="53.7" rx="3.3" ry="3.2" fill="#333"/><g fill="#b3b3b3"><ellipse cx="35.7" cy="53.7" rx=".8" ry=".8"/><path d="m35.7 54l4 .5v-.6l-4-.6z"/></g><path d="m39.6 51.9c-1.5.5-2.4 2.1-1.9 3.6l6.6-2.1c.8-.2 1.2-1 .9-1.8l-.4-1.3-5.2 1.6" fill="#d3976e"/><g fill="#3e4347"><path d="m44.8 50.2l-4.7 1.5-3.6-11.3 5.3-1.7z"/><path d="m42.3 40.8l-5.8-.4 4.6-8.7 4.9 2.5z"/></g><path d="M47,28.5l-11.5,4.5L26,24.3c0,0,2.4-4.9,3.7-5.1C39,17.4,47,28.5,47,28.5z" fill="#47b892"/><path d="m46 34.2l-10.2.6-.3-1.8 11.3-4.8c1.8 2.5-.8 6-.8 6" fill="#3e4347"/><g fill="#47b892"><path d="m26 24.3l-.3 7.4 3.1.1.3-5.9c0-.8-3.1-1.6-3.1-1.6"/><path d="m28.7 31.4c-.3-.8-1.2-1.1-2-.8l-5.7 2.1 1.1 2.8 5.7-2.2c.8-.2 1.2-1.1.9-1.9"/></g><path d="m21.9 34.1l-.4-1.4c-.1-.5-.7-.8-1.2-.7l-.7.2c-.4.1-.6.4-.7.8-.9.3-2.1 1-1.6 2.7.1.3.5 1.9 2.4 1.3 2.8-.8 2.8-.8 2.2-2.9" fill="#ffdd67"/><path fill="#ed4c5c" d="m15.2 51.2l-1.3-.8 8.3-14.5 1.4.8z"/><ellipse cx="14.8" cy="50.5" rx="1.2" ry="1.2" fill="#333"/></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(10,31)" id="g20"><path id="path22" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1,-1 0,-2 0,-3 0,-1 2,0 2,0 0,0 0.999,1 1.999,-1 1,-1.999 4.001,-1 3,1 -1,2 -4,1 -4,3 C 2.999,2 0,0 0,0"/></g><g transform="translate(14.9995,33.0005)" id="g24"><path id="path26" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1 0,-4 -1,-4 -1,0 -1,1 -2,2 -1,1 3,2 3,2"/></g><g transform="translate(18.9995,20.0005)" id="g28"><path id="path30" style="fill:#f9ca55;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -3,-1.999 -3,-3 0,-1.001 4,-4.001 5,-5.001 1,-1 3,-1 2,1 C 3,-5.001 0,0 0,0"/></g><g transform="translate(20.6338,12.9795)" id="g32"><path id="path34" style="fill:#2a6797;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 1.173,-0.789 1.962,0.385 0.789,1.174 1.365,-1.771 1.365,-1.771 0,0 -2.559,-2.539 -4.521,-2.924 -1.963,-0.384 -1.174,0.789 -0.385,1.962 C -0.789,-1.174 0,0 0,0"/></g><g transform="translate(7.0005,2)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.761,0 -5,2.238 -5,5 0,2.762 2.239,5 5,5 C 2.761,10 5,7.762 5,5 5,2.238 2.761,0 0,0 m 0,12 c -3.866,0 -7,-3.134 -7,-7 0,-3.866 3.134,-7 7,-7 3.866,0 7,3.134 7,7 0,3.866 -3.134,7 -7,7"/></g><g transform="translate(29,2)" id="g40"><path id="path42" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.761,0 -5,2.238 -5,5 0,2.762 2.239,5 5,5 C 2.762,10 5,7.762 5,5 5,2.238 2.762,0 0,0 m 0,12 c -3.865,0 -7,-3.134 -7,-7 0,-3.866 3.135,-7 7,-7 3.867,0 7,3.134 7,7 0,3.866 -3.133,7 -7,7"/></g><g transform="translate(22,16)" id="g44"><path id="path46" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.553 -0.484,1 -1.083,1 L -11.917,1 C -12.515,1 -13,0.553 -13,0 c 0,-0.553 0.485,-1 1.083,-1 l 10.834,0 C -0.484,-1 0,-0.553 0,0"/></g><g transform="translate(30,7)" id="g48"><path id="path50" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0.553 -0.447,1 -1,1 l -11,0 c -0.552,0 -1,-0.447 -1,-1 0,-0.553 0.448,-1 1,-1 l 11,0 c 0.553,0 1,0.447 1,1"/></g><g transform="translate(21.2236,19)" id="g52"><path id="path54" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.165,-11.664 c -0.186,-0.52 0.085,-1.092 0.605,-1.277 0.111,-0.04 0.225,-0.059 0.336,-0.059 0.411,0 0.796,0.255 0.942,0.664 L 2.124,0 0,0 Z"/></g><g transform="translate(29.001,6)" id="g56"><path id="path58" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.33,0 -0.654,0.164 -0.845,0.463 l -7,10.999 c -0.297,0.467 -0.159,1.085 0.307,1.381 0.467,0.297 1.084,0.159 1.381,-0.306 l 7,-11 C 1.14,1.071 1.002,0.453 0.536,0.156 0.369,0.051 0.184,0 0,0"/></g><g transform="translate(19,10.2656)" id="g60"><path id="path62" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -8.387,6.524 C -8.822,6.864 -9.45,6.785 -9.79,6.349 -10.129,5.912 -10.05,5.284 -9.614,4.945 l 9,-7 c 0.182,-0.142 0.398,-0.211 0.613,-0.211 L 0,-2.266 0,0 Z"/></g><g transform="translate(6.9995,6)" id="g64"><path id="path66" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.104,0 -0.211,0.017 -0.316,0.052 -0.84,0.226 -1.124,0.792 -0.949,1.316 L 1.823,9.633 -1.6,12.201 c -0.442,0.331 -0.531,0.958 -0.2,1.4 0.331,0.44 0.957,0.531 1.4,0.199 L 4.177,10.367 0.949,0.684 C 0.809,0.265 0.419,0 0,0"/></g><g transform="translate(26.3828,17)" id="g68"><path id="path70" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.03,0 -0.059,0.002 -0.089,0.006 l -5.672,0.708 c -0.372,0.047 -0.643,0.374 -0.62,0.748 0.024,0.374 0.333,0.664 0.707,0.665 0.041,0 4.068,0.018 5.989,1.299 C 0.565,3.594 0.898,3.583 1.14,3.4 1.379,3.215 1.477,2.899 1.381,2.612 L 0.672,0.485 C 0.575,0.192 0.302,0 0,0"/></g><g transform="translate(11,18)" id="g72"><path id="path74" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5,0 c -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 L 0,2 C 0.552,2 1,1.552 1,1 1,0.448 0.552,0 0,0"/></g><g transform="translate(21.999,23.0005)" id="g76"><path id="path78" style="fill:#2a6797;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3.999,-3 3,-3 L 0,0 Z"/></g><g transform="translate(19.999,19.0005)" id="g80"><path id="path82" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -2,-3.001 -2,-4.001 0,-1 1,-4 1,-7 0,-3 2,-3 2,-2 0,1 1.581,5.419 0,7 C 0,-5.001 3,-2 3,-2 L 0,0 Z"/></g><g transform="translate(15.6845,22.7034)" id="g84"><path id="path86" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2.75,0.784 c -0.446,-1.957 -3.023,-4.486 -3.935,-4.486 -1,0 -2,0 -2,-1 0,-1 0,-1 2,-1 2,0 4,2 5,3 0.65,0.65 1.31,1.756 1.685,2.702"/></g><g transform="translate(21.999,23.0005)" id="g88"><path id="path90" style="fill:#357baa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -3,-4 1,-7.001 C 1,-7.001 6,-2 6,0 6,2 3,3 3,3 L 0,0 Z"/></g><g transform="translate(20.9993,29.001)" id="g92"><path id="path94" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3,1 -5.585,0.414 -7,-1 -1,-1 -1,-2 -1,-4 0,-0.176 -0.03,-0.362 -0.073,-0.55 l 2.744,-0.784 C -5.127,-5.825 -5,-5.35 -5,-5 c 0,1 1,1 2,0 1,-1 2.001,-2 3.001,-2 1,0 6,4 6,4 C 3,-2 1.897,-0.632 0,0"/></g><g transform="translate(18.9995,7)" id="g96"><path id="path98" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 1,-1 2,0 1,1 1,-2 1,-2 0,0 -3,-2 -5,-2 -2,0 -1,1 0,2 l 2,2 z"/></g><g transform="translate(10.9995,34.0005)" id="g100"><path id="path102" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2,1 6,0 4,-2 -1,-1 -7,-2 -7,-2 0,1 1,3 3,4"/></g></g></g></g></svg>