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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f477.svg b/public/emoji/1f477.svg
index 56ae64c82..cb161f83a 100644
--- a/public/emoji/1f477.svg
+++ b/public/emoji/1f477.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="#ffb300" d="m6 28h52v12h-52z"/><path d="m8 37v-9h48v9c0 0 4 0 4 5s-4 5-4 5c0 8-18 15-24 15s-24-7-24-15c0 0-4 0-4-5 0-5 4-5 4-5" fill="#ffdd67"/><path d="m20 35.8c-5 0-7 1.8-7 3.6 0 1.8 0 4.4 6.6 4.4 6.4 0 7.4-.8 7.4-3.5 0-1.8-2-4.5-7-4.5" fill="#f5f5f5"/><circle cx="20.5" cy="38.8" r="4.5" fill="#664e27"/><path d="m22 38.8c0 .8-.7 1.5-1.5 1.5-.8 0-1.5-.7-1.5-1.5s.7-1.5 1.5-1.5c.8 0 1.5.7 1.5 1.5" fill="#231f20"/><path d="m13 39.3c0-7 14-7 14 1-2-6-12-6-14-1" fill="#664e27"/><path d="m44 35.8c5 0 7 1.8 7 3.6 0 1.8 0 4.4-6.6 4.4-6.4 0-7.4-.8-7.4-3.5 0-1.8 2-4.5 7-4.5" fill="#f5f5f5"/><circle cx="43.5" cy="38.8" r="4.5" fill="#664e27"/><path d="m42 38.8c0 .8.7 1.5 1.5 1.5.8 0 1.5-.7 1.5-1.5s-.7-1.5-1.5-1.5c-.8 0-1.5.7-1.5 1.5" fill="#231f20"/><path d="m51 39.3c0-7-14-7-14 1 2-6 12-6 14-1" fill="#664e27"/><path d="m41 50.9c0 3.4-4.5 5.1-9 5.1s-9-1.7-9-5.1c0 0 0-.9.9-.9 4.1 0 12.1 0 16.2 0 .9 0 .9.9.9.9" fill="#937237"/><path d="M59,31H5C5,16.6,11.8,5.5,32,5.5C52.2,5.5,59,16.6,59,31z" fill="#ff9430"/><g fill="#db802b"><path d="m24.5 31h-4v-23.9l4-1.2z"/><path d="m43.5 31h-4v-25.1l4 1.2z"/><path d="m62 33.2h-60c0-5.1 13.4-9.3 30-9.3s30 4.2 30 9.3"/></g><path d="M41.5,27.7H22.5V6.6c0-6.1,19.1-6.1,19.1,0V27.7z" fill="#ff9430"/></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,0 33,0 33,36 0,36 0,0 Z"/></clipPath><clipPath id="clipPath94" clipPathUnits="userSpaceOnUse"><path id="path96" d="M 17.998,36 C 13,36 10.874,34.663 9,32 l 0,0 C 7.007,29.169 9,27 6,25 l 0,0 c -1.861,-1.24 6,-2.313 12,-2.313 l 0,0 c 6,0 13.861,1.073 12,2.313 l 0,0 c -3,2 -1.007,4.169 -3,7 l 0,0 c -1.873,2.663 -5,4 -9.002,4 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(32,0)" id="g20"><path id="path22" style="fill:#f2760f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,2 c 0,3.314 -2.686,6 -6,6 l -16,0 c -3.313,0 -6,-2.686 -6,-6 l 0,-2 28,0 z"/></g><path id="path24" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 23,5 13,5 13,9 23,9 23,5 Z"/><g transform="translate(14,9)" id="g26"><path id="path28" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 8,0 C 8,0 6.982,-7 4,-7 1.018,-7 0,0 0,0"/></g><g transform="translate(13.6396,5.9619)" id="g30"><path id="path32" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.745,-1.268 2.849,-1.963 4.36,-1.963 1.512,0 2.616,0.696 4.36,1.963 l 0,5.749 L 0,5.749 0,0 Z"/></g><g transform="translate(13.6318,10.0273)" id="g34"><path id="path36" style="fill:#f9ca55;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.216,-1.374 2.724,-1.746 4.364,-1.746 1.639,0 3.147,0.373 4.364,1.746 l 0,3.491 L 0,3.491 0,0 Z"/></g><g transform="translate(11.4443,20.0645)" id="g38"><path id="path40" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.734,-2.622 -1.639,-2.622 -0.905,0 -1.639,1.174 -1.639,2.622 0,1.448 0.734,2.623 1.639,2.623 C -0.734,2.623 0,1.448 0,0"/></g><g transform="translate(27.834,20.0645)" id="g42"><path id="path44" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.734,-2.622 -1.639,-2.622 -0.906,0 -1.638,1.174 -1.638,2.622 0,1.448 0.732,2.623 1.638,2.623 C -0.734,2.623 0,1.448 0,0"/></g><g transform="translate(9.4775,19.0405)" id="g46"><path id="path48" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.589 3.816,10.121 8.523,10.121 4.707,0 8.523,-4.532 8.523,-10.121 0,-5.589 -3.816,-10.121 -8.523,-10.121 C 3.816,-10.121 0,-5.589 0,0"/></g><g transform="translate(18,12.1982)" id="g50"><path id="path52" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.754,0 -3.6,0.705 -3.74,0.848 -0.257,0.256 -0.257,0.671 0,0.927 0.248,0.248 0.644,0.254 0.902,0.023 C -2.787,1.761 -2.117,1.311 0,1.311 c 2.201,0 2.836,0.485 2.842,0.49 C 3.098,2.056 3.5,2.044 3.756,1.786 4.012,1.53 3.998,1.104 3.742,0.848 3.6,0.705 2.754,0 0,0"/></g><g transform="translate(18,32.5205)" id="g54"><path id="path56" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 5.648,0 9.178,-4.168 9.178,-7.641 0,-3.473 -0.705,-4.863 -1.412,-3.473 -0.705,1.389 -1.412,2.778 -1.412,2.778 0,0 -4.235,0 -5.647,1.39 0,0 2.117,-4.168 -2.119,0 0,0 0.707,-2.779 -3.53,0.694 0,0 -2.118,-1.389 -2.824,-4.862 -0.196,-0.964 -1.412,0 -1.412,3.473 C -9.178,-4.168 -6.354,0 0,0"/></g><g transform="translate(14,19)" id="g58"><path id="path60" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.55,0 -1,0.45 -1,1 l 0,1 C -1,2.55 -0.55,3 0,3 0.551,3 1,2.55 1,2 L 1,1 C 1,0.45 0.551,0 0,0"/></g><g transform="translate(22,19)" id="g62"><path id="path64" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.549,0 -1,0.45 -1,1 l 0,1 C -1,2.55 -0.549,3 0,3 0.551,3 1,2.55 1,2 L 1,1 C 1,0.45 0.551,0 0,0"/></g><g transform="translate(18.75,16.25)" id="g66"><path id="path68" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.5,0 c -0.412,0 -0.75,0.337 -0.75,0.75 0,0.413 0.338,0.75 0.75,0.75 L 0,1.5 C 0.414,1.5 0.75,1.163 0.75,0.75 0.75,0.337 0.414,0 0,0"/></g><g transform="translate(30,25)" id="g70"><path id="path72" style="fill:#fff75f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3,2 -1.008,4.169 -3,7 -1.873,2.663 -5,4 -9.002,4 C -17,11 -19.126,9.663 -21,7 c -1.992,-2.831 0,-5 -3,-7 -1.861,-1.24 6,-2.313 12,-2.313 6,0 13.861,1.073 12,2.313"/></g><g transform="translate(19,1.0625)" id="g74"><path id="path76" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,-1.062 -1,1 0,3 2,0 L 0,0 Z"/></g><path id="path78" style="fill:#fff75f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 12,0 9,0 9,8 12,8 12,0 Z"/><path id="path80" style="fill:#fff75f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 27,0 -3,0 0,8 3,0 0,-8 z"/><g transform="translate(11,8)" id="g82"><path id="path84" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1 1,-3 3,-5 4.582,-6.581 7,-8 7,-8 7,-4.937 6,-4 5,-3 4,-2 2,-1 2,1 2,2 0,0 0,0"/></g><g transform="translate(25,8)" id="g86"><path id="path88" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1 -1,-3 -3,-5 -1.58,-1.581 -4,-3 -4,-3 0,3.063 1,4 2,5 1,1 3,2 3,4 0,1 2,-1 2,-1"/></g></g></g><g id="g90"><g clip-path="url(#clipPath94)" id="g92"><g transform="translate(16,24.5)" id="g98"><path id="path100" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.5,0 c -3.604,0 -10.687,1.035 -12.724,2.053 -0.247,0.123 -0.347,0.424 -0.223,0.671 0.124,0.247 0.424,0.346 0.671,0.223 C -10.983,2.05 -4.591,1.093 -1,1.006 L -1,11.5 C -1,11.776 -0.776,12 -0.5,12 -0.224,12 0,11.776 0,11.5 L 0,0 Z"/></g><g transform="translate(20.5,24.5)" id="g102"><path id="path104" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.5,0 0,11.5 c 0,0.276 0.224,0.5 0.5,0.5 0.276,0 0.5,-0.224 0.5,-0.5 L 0.5,1.004 C 5.042,1.076 14.513,2.065 16.276,2.947 16.524,3.069 16.823,2.971 16.947,2.724 17.07,2.477 16.971,2.176 16.724,2.053 14.603,0.993 3.941,0 0,0"/></g></g></g></g></svg>