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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f93d.svg b/public/emoji/1f93d.svg
index 1ba0ab89e..1cbe1e8e3 100644
--- a/public/emoji/1f93d.svg
+++ b/public/emoji/1f93d.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" enable-background="new 0 0 64 64"><g fill="#ffdd67"><path d="m48.2 14.7l-3.3 8.4-6.5 2.8c0 0-10 2.7-10.4 2.8l-10.2 3.7c-.8.2-1.5.7-1.9 1.4l-4.2 8.6c-1.7-.4-2.1.4-3.4 4-1.2 3.1 1.5 4.1 2 4.3 2.9 1.1 4.3-.8 5-2.3.6-.1 1.2-.5 1.4-1.1l.4-1.2c.2-.7 0-1.4-.4-1.8l3.5-7.1 2.7-1c-.4 5.7 2.1 12.8-.1 19.8l19.1-.7c-5.5-6.9-2-15.6-1.8-22.6l8.4-5.4c.4-.3.8-.7 1-1.2l3.7-9.5-5-1.9"/><path d="m32.7 20.6l3.6-1.1-2.2 11.2-7.3-1.4z"/></g><path d="m26.8 24.9c1.9 1.7.1 4.4.1 4.4 3 .6 6.2-4.8 6.9-8.4l-7 4" fill="#eba352"/><path d="m37.8 6.4l-13.9 1.9c-2.2 2.7-1.4 4.5-1.8 5.8-.1.6-1.5 1.4-2.3 1.8-1.6 1 .5 2.4 1.4 2.4.3 1.4-1.5 1.8 2.5 1.8 0 0-4.3.9-1.6 2.2-.6 1.5-1.5 4.4 7.3 3 2.6-.4 4.3-4.5 4.3-4.5l4.3.2-.2-14.6" fill="#ffdd67"/><g fill="#937237"><path d="m25.4 14.8c-.2.8-.8 1.4-1.3 1.3-.6-.1-.6-.8-.4-1.6.2-.8.5-1.4 1-1.3s.8.7.7 1.6"/><path d="m25.2 20.1c0 0-1.8.9-2.4 1-1.3.4-1.4-.1-.6-.4.6-.3 1.7-.6 1.7-.6h1.3"/></g><path d="m57 3.1c4.6 2.4 6.4 8 3.9 12.5-2.5 4.5-8.2 6.2-12.8 3.8-4.6-2.4-6.4-8-3.9-12.5 2.4-4.5 8.1-6.2 12.8-3.8" fill="#ffce31"/><path d="m59.4 4.9c-4.9.6-8.3 2.4-9.6 3.3-.3-.5-.5-1-.7-1.7.7-.7 2.9-2.7 7.2-3.7-.9-.4-1.8-.6-2.7-.7-2.3.8-3.9 1.9-4.8 2.7 0-.6 0-1.3.1-2.1-.6.2-1.1.5-1.6.8-.4 5.6 3.2 7.7 4.5 8.3 0 .4.1 1.1-.2 2-1.4-.6-4.8-2.5-7.6-6.7-.3.5-.5 1.1-.7 1.6 2.9 4 6.3 5.8 7.8 6.5-.3.5-.6 1-1.1 1.4-1-.2-3.9-1.2-7-4.6.1.9.3 1.8.6 2.7 2 1.7 3.8 2.6 5 3-.5.4-1.2.7-1.9 1 .4.3.8.6 1.3.8.1 0 .2.1.3.1 5-2.5 5.1-6.6 5-8 .3-.2.9-.6 1.7-.8 0 1.6-.1 5.4-2 9.8.6 0 1.2-.1 1.7-.2 1.8-4.5 1.8-8.2 1.8-9.8.6 0 1.2 0 1.8.2.3.9.9 3.8-.4 8.1.7-.5 1.4-1.1 2-1.8.5-2.5.3-4.5.1-5.7.6.3 1.2.7 1.9 1.2.1-.6.1-1.2.1-1.8-4.7-3.2-8.4-1.2-9.6-.4-.4-.2-1-.5-1.6-1.1 1.3-.8 4.8-2.6 9.7-3-.3-.5-.7-.9-1.1-1.4" fill="#f2b200"/><g fill="#eba352"><ellipse transform="matrix(.9994-.0353.0353.9994-1.2782.9539)" cx="26.4" cy="36.7" rx="1.1" ry="1.5"/><path d="m34.6 35.2c0 .8-.4 1.5-1.1 1.5-.6 0-1.1-.6-1.2-1.4 0-.8.4-1.5 1.1-1.5.7-.1 1.2.5 1.2 1.4"/></g><path d="m23.3 9.2c0 0 11.6.5 12.1 14.3 0 0 7.4-2 7.1-11-.3-9.1-12.5-14.8-19.2-3.3" fill="#ed4c5c"/><path d="m42.2 10.2c-2.9 1.7-3.8 4.9-3.8 4.9-1.4-1.3-2.5-1.2-2.5-1.2-1 .8-1.3 2.8-1.3 4.7.4 1.4.7 3 .7 4.8 0 0 7.4-2 7.1-11 .1-.8 0-1.5-.2-2.2" opacity=".5" fill="#3e4347"/><path d="m37.9 16.6c.1 1.6-1.2 3-2.9 3.1-1.6.1-3-1.2-3.1-2.9-.1-1.6 1.2-3 2.9-3.1 1.7 0 3.1 1.3 3.1 2.9" fill="#ed4c5c"/><g fill="#3e4347"><circle cx="33.9" cy="15.3" r=".5"/><circle cx="35.9" cy="15.2" r=".5"/><path d="m34 17.7c-.3 0-.5.2-.5.5 0 .3.2.5.5.5s.5-.2.5-.5c0-.3-.2-.5-.5-.5"/><circle cx="36" cy="18.1" r=".5"/><path d="m33 16.3c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.3-.5-.5-.5"/><circle cx="35" cy="16.7" r=".5"/><path d="m36.9 16.1c-.3 0-.5.2-.5.5 0 .3.2.5.5.5.3 0 .5-.2.5-.5 0-.3-.2-.5-.5-.5"/></g><path d="m57.7 51.7c-2.4 0-2.7-1.2-4.3-1.2s-1.9 1.2-4.3 1.2c-2.4 0-2.7-1.2-4.3-1.2s-1.9 1.2-4.3 1.2c-2.4 0-2.7-1.2-4.3-1.2s-1.9 1.2-4.3 1.2-2.7-1.2-4.3-1.2c-1.6 0-1.9 1.2-4.3 1.2-2.4 0-2.7-1.2-4.3-1.2s-1.9 1.2-4.3 1.2-2.7-1.2-4.3-1.2-1.9 1.2-4.3 1.2c-2.4 0-4.3-1.2-4.3-1.2v11.5h60v-11.5c.2 0-1.7 1.2-4.1 1.2" fill="#75d6ff"/><g fill="#42ade2"><path d="m23.8 60c-6.8.7-11.4-3.5-18.5-1.1 5.4-.3 13.6 2.9 18.5 1.1"/><path d="m35.4 55.4c-6.8.7-11.5-3.6-18.5-1.1 5.5-.3 13.6 3 18.5 1.1"/><path d="m47 60c-6.8.7-11.4-3.5-18.5-1.1 5.5-.3 13.7 2.9 18.5 1.1"/><path d="m58.7 55.4c-6.8.7-11.5-3.6-18.5-1.1 5.5-.3 13.6 3 18.5 1.1"/></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><clipPath id="clipPath38" clipPathUnits="userSpaceOnUse"><path id="path40" d="m 28.665,33.027 c 0,-1.518 1.231,-2.749 2.75,-2.749 l 0,0 c 1.519,0 2.75,1.231 2.75,2.749 l 0,0 c 0,1.519 -1.231,2.751 -2.75,2.751 l 0,0 c -1.519,0 -2.75,-1.232 -2.75,-2.751"/></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(34.0811,34.5786)" id="g20"><path id="path22" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.522,1.084 -3.531,-2.522 -3.987,-3.016 l 1.763,-1.469 -0.591,-5.579 c 0,0 -1.488,0.555 -2.558,0.689 -0.918,0.114 -2.56,-0.187 -2.56,-0.187 0,0 -2.072,0.714 -2.421,0.69 -1.15,-0.076 -2.226,-0.688 -2.226,-0.688 l -0.453,1.713 c 0.97,0.747 1.608,1.971 1.608,3.362 0,2.278 -1.699,4.125 -3.792,4.125 -2.094,0 -3.787,-1.856 -3.583,-4.125 0.167,-1.861 1.017,-3.351 2.405,-3.893 l -0.167,-1.441 c -0.486,0.043 -2.154,0.302 -3.21,-0.009 -2.334,-0.689 -5.404,-2.711 -6.08,-2.81 -0.473,-0.07 -2.608,-0.675 -4.14,-0.901 -0.277,-0.041 -0.891,0.966 -1.415,1.033 -0.15,0.02 -0.686,-0.691 -0.836,-0.672 -0.559,0.069 -1.078,0.115 -1.306,0.022 -0.926,-0.381 -0.4,-3.381 0.726,-3.214 0,0 2.036,0.483 2.793,0.574 1.669,0.2 4.343,0.273 5.318,0.536 1.415,0.382 4.34,1.45 4.34,1.45 -0.139,-0.467 -0.395,-2.713 -0.28,-3.516 0.268,-1.876 0.962,-5.411 1.262,-7.116 0.447,-2.541 6.526,-0.148 8.302,-0.148 0,0 -0.805,3.362 0.344,6.154 0.538,1.309 1.179,4.824 1.191,5.175 0,0 7.852,-0.208 8.847,0.557 1.012,0.778 0.65,8.461 0.565,8.233 C 0.172,-4.172 1.294,-0.922 0,0"/></g><g transform="translate(17.7906,33.1443)" id="g24"><path id="path26" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.875,0.187 3.306,-0.636 3.625,-2.512 0.499,-2.935 -0.802,-4.155 -1.971,-4.592 -1.06,-0.396 -2.553,0.555 -2.488,0.548 0,0 0.992,-1.387 2.74,-0.85 1.387,0.426 1.86,1.792 2.218,1.959 0.464,0.217 0.87,0.458 1.032,0.728 0.313,0.532 0.406,1.281 0.25,1.969 C 5.344,-2.476 5.083,-2.212 5.075,-1.942 5.014,0.142 3.413,1.625 1.051,1.437 -0.611,1.306 -1.625,0.374 -2.16,-0.961 -1.981,-0.86 -1.322,-0.132 0,0"/></g><path id="path28" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,12 8.686,0 c 2.715,0 4.022,1.106 5.473,1.235 C 15.61,13.364 16.958,12 17.737,12 c 0.78,0 1.091,0.509 1.661,0.509 0.294,0 0.917,-0.509 1.592,-0.509 0.675,0 2.385,1.235 3.074,1.235 C 25.46,13.235 27.64,12 29.075,12 L 36,12 36,0 0,0 Z"/><g transform="translate(34.1653,33.0275)" id="g30"><path id="path32" style="fill:#ffd03f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.519 -1.231,-2.75 -2.75,-2.75 -1.519,0 -2.75,1.231 -2.75,2.75 0,1.519 1.231,2.75 2.75,2.75 C -1.231,2.75 0,1.519 0,0"/></g></g></g><g id="g34"><g clip-path="url(#clipPath38)" id="g36"><g transform="translate(34.0746,34.5412)" id="g42"><path id="path44" style="fill:#ffad1f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.013,0.003 -0.896,0.213 -1.651,-0.253 -10e-4,0 -0.003,0 -0.004,-0.001 -0.003,-0.002 -0.005,-0.004 -0.008,-0.006 -0.328,-0.206 -0.631,-0.541 -0.827,-1.078 -0.366,0.008 -0.698,0.044 -0.991,0.109 0.81,2.334 2.812,1.772 2.898,1.746 0.08,-0.024 0.166,0.022 0.19,0.103 0.024,0.08 -0.022,0.165 -0.102,0.19 -0.025,0.007 -2.379,0.68 -3.282,-1.959 -0.274,0.089 -0.507,0.207 -0.692,0.354 0.008,0.011 0.015,0.023 0.019,0.037 0.587,1.779 2.305,1.959 2.378,1.966 0.083,0.008 0.145,0.083 0.138,0.166 C -1.942,1.458 -2.018,1.52 -2.1,1.513 -2.12,1.511 -4.023,1.316 -4.705,-0.566 -4.985,-0.219 -4.98,0.116 -4.98,0.133 -4.977,0.216 -5.042,0.287 -5.126,0.291 -5.21,0.293 -5.281,0.229 -5.285,0.145 c -10e-4,-0.022 -0.018,-0.537 0.438,-1.013 0.484,-0.505 1.298,-0.765 2.415,-0.777 0.098,-0.341 0.148,-0.655 0.163,-0.94 -2.881,-0.103 -3.471,1.875 -3.495,1.962 -0.022,0.081 -0.106,0.129 -0.188,0.106 -0.081,-0.022 -0.129,-0.106 -0.107,-0.187 0.007,-0.023 0.636,-2.191 3.583,-2.191 0.068,0 0.139,0.002 0.209,0.005 -0.01,-0.295 -0.058,-0.555 -0.124,-0.779 -2.71,0.073 -3.242,1.656 -3.264,1.725 -0.025,0.081 -0.11,0.129 -0.191,0.104 -0.08,-0.025 -0.126,-0.106 -0.101,-0.186 0.023,-0.076 0.593,-1.869 3.453,-1.929 -0.201,-0.484 -0.466,-0.739 -0.489,-0.76 -0.062,-0.057 -0.065,-0.154 -0.008,-0.216 0.03,-0.032 0.071,-0.049 0.112,-0.049 0.037,0 0.074,0.014 0.104,0.041 0.053,0.049 1.288,1.221 0.619,3.444 -10e-4,0.004 -0.019,0.06 -0.03,0.094 0.139,0.361 0.333,0.613 0.548,0.786 1.045,-2.125 -0.356,-4.083 -0.371,-4.103 -0.05,-0.068 -0.035,-0.163 0.033,-0.213 0.027,-0.02 0.059,-0.03 0.09,-0.03 0.047,0 0.093,0.022 0.123,0.063 0.016,0.021 1.541,2.145 0.383,4.451 0.214,0.111 0.435,0.164 0.633,0.185 0.001,-0.002 0.001,-0.005 0.002,-0.007 1.162,-1.81 -0.637,-4.425 -0.655,-4.451 -0.048,-0.07 -0.031,-0.165 0.038,-0.213 0.026,-0.019 0.057,-0.028 0.087,-0.028 0.048,0 0.096,0.023 0.125,0.065 0.02,0.029 0.489,0.704 0.811,1.629 0.407,1.17 0.386,2.207 -0.06,3.014 0.183,-0.01 0.307,-0.039 0.325,-0.044 0.082,-0.019 0.165,0.03 0.185,0.112 C 0.131,-0.103 0.082,-0.021 0,0"/></g></g></g></g></svg>