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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f6b5-1f3fc.svg b/public/emoji/1f6b5-1f3fc.svg
index 9b088b9f7..82785c12e 100644
--- a/public/emoji/1f6b5-1f3fc.svg
+++ b/public/emoji/1f6b5-1f3fc.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="#fed0ac" d="m37 16.4l2.8-1.5v9.5h-6.2z"/><path d="m32.9 20.8c1.8 1.1.8 3.6.8 3.6 2.5 0 4.3-4.9 4.3-8l-5.1 4.4" fill="#e0a372"/><path d="m38.8 4l-11 3.8c-1.4 2.5-.4 3.9-.5 5 0 .5-1 1.4-1.5 1.9-1.2 1 .8 1.9 1.5 1.7.5 1.1-.9 1.7 2.4 1.1 0 0-3.4 1.4-1 2.1-.2 1.3-.5 3.8 6.4 1.2 2-.8 2.8-4.4 2.8-4.4l3.4-.6-2.5-11.8" fill="#fed0ac"/><path d="m31.1 3.1c7.2-2.4 11.2 1.3 11.8 3 1.8 4.4.3 9.4-3.1 13.1 0 0-1.6-.7-1.9-2.7 0 0 1.8.8 2.6-3 .7-3.2-2.7-4.9-4.4-.5h-.5c-1-2.2.8-5-1.8-5.8-2.2-.8-6.2 1.2-6.2 1.2-.7-1.4.5-4.3 3.5-5.3" fill="#dbb471"/><path d="m30.1 12.8c0 .7-.4 1.2-.9 1.2s-.6-.6-.6-1.2c0-.7.1-1.2.6-1.2s.9.6.9 1.2" fill="#664e27"/><path d="m37 13.7c0-1.3 1.1-2.5 2.2-2.5 0 0-1.9 1.6-1.4 3.8 0 0-.8-.3-.8-1.3" fill="#e0a372"/><path d="m30.8 17.2c0 0-1.4 1-1.8 1.2-1 .5-1.1.2-.6-.3.4-.4 1.3-.7 1.3-.7l1.1-.2" fill="#664e27"/><path d="M62,62v-7.1c0,0-25.2-7-60-40.6V62H62z" fill="#aec470"/><path d="M62,62v-3.3c0,0-25.1,6.4-60-22.5V62H62z" fill="#95a55b"/><g fill="#3e4347"><path d="m37.9 18.7l-1.3.2-2-8.6 1.3-.2z"/><path d="m37.6 19l-1.1-.7 4.2-4.7 1.1.6z"/><path transform="matrix(.1669-.986.986.1669 11.186 53.0165)" d="m34.6 19h4.8v1.7h-4.8z"/></g><path d="m43.9 15.3c-.7 1.6-5.5-2.8-8.7-4.2-3.5-1.5-9.5-2.2-9-3.5 2.1-4.8 7.7-6.9 12.6-4.8 5 2.1 7.2 7.7 5.1 12.5" fill="#f15744"/><g fill="#3b946f"><path d="m34.6 22.7c-.7-.4-1.5-.2-1.9.5l-2.6 4.4 2.4 1.4 2.6-4.4c.4-.7.1-1.5-.5-1.9"/><path d="m32.5 28.5c.1-.7-.5-1.4-1.2-1.5l-5.3-.6-.3 2.6 5.3.7c.8.1 1.5-.4 1.5-1.2"/></g><path d="m26.2 27.8l.3-1.3c.1-.5-.2-.9-.7-1l-.6-.1c-.3-.1-.7.1-.9.3-.9-.1-2-.1-2.4 1.5-.1.3-.4 1.6 1.3 2 2.6.5 2.6.5 3-1.4" fill="#e0a372"/><path d="m30.1 44c-1.4-.4-2.8.4-3.1 1.7l5.9 1.6c.7.2 1.4-.2 1.6-.9l.3-1.2-4.7-1.2" fill="#d3976e"/><g fill="#3e4347"><path d="m34.7 45.2l-4.6-1.3 2.3-8.1 4.6 1.3z"/><path d="m36.5 39l-4.1-3.2 6.4-4 4.9 2.9z"/></g><g fill="#333"><path d="m13.1 49.5c-1.3-.5-2.5-1.2-3.5-2.1-1-.9-1.8-2-2.3-3.2-.6-1.2-.9-2.5-1-3.8-.1-1.4.1-2.7.6-4 .4-1.2 1.1-2.3 2.1-3.3.9-1 2-1.7 3.2-2.3 1.2-.5 2.5-.9 3.8-.9 1.4-.1 2.7.1 4 .6 1.3.5 2.5 1.2 3.5 2.1 1 .9 1.8 2 2.3 3.2.6 1.2.9 2.5 1 3.8.1 1.4-.1 2.7-.6 4-.5 1.2-1.2 2.4-2.1 3.4-.9 1-2 1.7-3.2 2.3-1.2.5-2.5.9-3.8.9-1.4 0-2.7-.2-4-.7m6.3-17.3c-4.4-1.6-9.3.6-10.9 4.9-1.6 4.3.7 9.1 5.1 10.8 4.4 1.6 9.3-.6 10.9-4.9 1.6-4.4-.7-9.2-5.1-10.8"/><path d="m43 60.4c-1.3-.5-2.5-1.2-3.5-2.1-1-.9-1.8-2-2.3-3.2-.6-1.2-.9-2.5-1-3.8-.1-1.4.1-2.7.6-4 .5-1.3 1.2-2.4 2.1-3.4.9-1 2-1.7 3.2-2.3 1.2-.5 2.5-.9 3.8-.9 1.4-.1 2.7.1 4 .6 1.3.5 2.5 1.2 3.5 2.1 1 .9 1.8 2 2.3 3.2s.9 2.5 1 3.8c.1 1.4-.1 2.7-.6 4-.5 1.3-1.2 2.4-2.1 3.4-.9 1-2 1.7-3.2 2.3s-2.4.9-3.7.9c-1.4.1-2.8-.1-4.1-.6m6.3-17.3c-4.4-1.6-9.3.6-10.9 4.9-1.6 4.3.7 9.1 5.1 10.8 4.4 1.6 9.3-.6 10.9-4.9 1.7-4.4-.7-9.2-5.1-10.8"/></g><path d="m43.7 36.6l3.3-3.6-1-.9-3.2 3.5-18.3-6.6-1.1-2.5-1.2.5 1.3 3 2.8 1-.8 2.3 7.4 15.3 9.7-10.7 3.3 13 1.3-.1-3.5-14.2m-10.5 9.7l-6.7-13.9.9-1 14.5 5.3-8.7 9.6" fill="#ed4c5c"/><ellipse transform="matrix(.3419-.9397.9397.3419-17.2712 77.1916)" cx="46.5" cy="50.9" rx="2" ry="2.1" fill="#333"/><g fill="#94989b"><path transform="matrix(.3421-.9397.9397.3421-24.8566 57.0869)" d="m27.8 44.5h1.1v3.5h-1.1z"/><path transform="matrix(.342-.9397.9397.342-23.359 68.9155)" d="m37 49.4h1.1v3.5h-1.1z"/></g><path fill="#b3b3b3" d="m29.9 46.6l-.2.5 3.1 1.6.2-.5z"/><ellipse transform="matrix(.3419-.9397.9397.3419-24.3947 62.974)" cx="32.8" cy="48.9" rx="2.8" ry="2.9" fill="#333"/><g fill="#b3b3b3"><ellipse transform="matrix(.3415-.9399.9399.3415-24.3909 63.0019)" cx="32.8" cy="48.9" rx=".7" ry=".7"/><path d="m32.7 49.2l3.1 1.6.2-.5-3.1-1.6z"/></g><path d="m36.5 48.6c-1.4-.1-2.6 1-2.6 2.4l6.1.2c.7 0 1.3-.5 1.3-1.2v-1.2l-4.8-.2" fill="#d3976e"/><g fill="#3e4347"><path d="m41.3 48.8l-4.3-.2.4-10.3 4.8.2z"/><path d="m42 40.4l-4.6-2.1 6.3-5.8 3.3 3.5z"/></g><path d="m49.6 31.6l-10.8.2-5.1-9.4c0 0 3.1-1.9 4.3-1.7 8.2 1.4 11.6 10.9 11.6 10.9" fill="#47b892"/><path d="m47 36l-8.6-2.6.3-1.5 10.7-.6c.8 2.6-2.4 4.7-2.4 4.7" fill="#3e4347"/><g fill="#47b892"><path d="m34.8 22.4c-.7-.3-1.5 0-1.8.7l-2 4.7 2.5 1 2-4.7c.4-.6 0-1.4-.7-1.7"/><path d="m33.7 28.5c0-.7-.6-1.3-1.4-1.3l-5.3.1v2.7l5.3-.1c.8 0 1.4-.6 1.4-1.4"/></g><path d="m27.3 28.7l.1-1.3c0-.5-.3-.9-.8-.9l-.6-.1c-.3 0-.7.1-.8.4-.9 0-2 .2-2.1 1.8 0 .3-.1 1.7 1.6 1.8 2.5.2 2.5.2 2.6-1.7" fill="#fed0ac"/><path fill="#ed4c5c" d="m16.7 40.8l-.9-1.1 11.2-9.4.9 1z"/><ellipse transform="matrix(.3413-.94.94.3413-26.7403 41.8999)" cx="16.5" cy="40" rx="1" ry="1" 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"><path id="path20" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 36,0 0,25 c 0,0 -6.001,10 -9.001,10 -3,0 -10,-9 -12,-10.999 -2,-2 -4.5,-0.5 -5.999,1 C 7.5,26.5 6,28 5,28 4,28 0,21.001 0,21.001 L 0,0 Z"/><g transform="translate(10,31)" id="g22"><path id="path24" style="fill:#f3d2a2;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="g26"><path id="path28" style="fill:#ffe51e;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="g30"><path id="path32" style="fill:#e2c196;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="g34"><path id="path36" 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="g38"><path id="path40" 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="g42"><path id="path44" 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="g46"><path id="path48" style="fill:#e1e8ed;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="g50"><path id="path52" style="fill:#e1e8ed;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="g54"><path id="path56" style="fill:#e1e8ed;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="g58"><path id="path60" style="fill:#e1e8ed;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="g62"><path id="path64" style="fill:#e1e8ed;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="g66"><path id="path68" style="fill:#e1e8ed;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="g70"><path id="path72" 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="g74"><path id="path76" 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="g78"><path id="path80" 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="g82"><path id="path84" style="fill:#f3d2a2;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="g86"><path id="path88" style="fill:#f3d2a2;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="g90"><path id="path92" 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="g94"><path id="path96" 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="g98"><path id="path100" 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="g102"><path id="path104" 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>