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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f933-1f3fe.svg b/public/emoji/1f933-1f3fe.svg
index d19b5ea81..1d313cf18 100644
--- a/public/emoji/1f933-1f3fe.svg
+++ b/public/emoji/1f933-1f3fe.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="#b47d56"><path d="m38.6 32.7v-1.6h-4.4v1.6c0 .9-.7 1.6-1.5 1.6h7.5c-.9 0-1.6-.7-1.6-1.6"/><path d="m30.7 34.3h11.3v5.1h-11.3z"/></g><path d="m25.9 34.3c-1.4 0-2.1.8-2.6 1.3-16 18.2-16 18.2-16 18.2h3.2c2.5 0 3.3-.9 4-1.7 15.7-17.8 15.7-17.8 15.7-17.8h-4.3" fill="#75a843"/><path d="m4.9 43.8l4.8 2.9c.9.5 2 .3 2.6-.6.6-.8.3-2-.6-2.5l-4.8-2.9c-.9-.5-2-.3-2.6.6-.5.8-.2 2 .6 2.5" fill="#935e3e"/><path d="m17.7 48.3c0 .6-.5 1.1-1.1 1.1h-9.2c-.6 0-1.1-.5-1.1-1.1v-20.6c0-.6.5-1.1 1.1-1.1h9.1c.6 0 1.1.5 1.1 1.1v20.6z" fill="#3e4347"/><circle cx="12" cy="31.1" r="1.1" fill="#b2c1c0"/><circle cx="12" cy="31.1" r=".6" fill="#3e4347"/><path d="m12.8 51.5c0 1.3-1 2.3-2.3 2.3h-4.2c-1.3 0-2.3-1-2.3-2.3v-7.7c0-1.3 1-2.3 2.3-2.3h4.3c1.3 0 2.3 1 2.3 2.3v7.7z" fill="#b47d56"/><path d="m53.4 24.9v4.2c0 .8.6 1.4 1.4 1.4.8 0 1.4-.6 1.4-1.4v-4.2c0-.8-.6-1.4-1.4-1.4s-1.4.6-1.4 1.4" fill="#935e3e"/><path d="m60 34.1c0 .9-.8 1.7-1.7 1.7h-3.2c-.9 0-1.7-.8-1.7-1.7v-5.8c0-.9.8-1.7 1.7-1.7h3.2c.9 0 1.7.8 1.7 1.7v5.8" fill="#b47d56"/><path d="m16.3 28.7c0 .2-.1.3-.3.3h-.6c-.2 0-.3-.1-.3-.3v-.6c0-.2.1-.3.3-.3h.6c.2 0 .3.1.3.3 0 .1 0 .6 0 .6" fill="#fff"/><path d="m54.3 35.6c-1 2.2-1.9 4.2-2.7 6-.8-1.8-1.7-3.8-2.7-6-.3-.7-1.2-1.3-2.6-1.3h-2.6c0 0 3.5 7.9 4.7 10.5 0 .1.9 2 2.8 2h.2c.6 0 2.4-.2 3.2-2l4.1-9.1h-4.4z" fill="#75a843"/><path d="m46.4 34.3h-5.6c-.5 2.1-2.3 3.7-4.4 3.7-2.1 0-3.9-1.6-4.4-3.7h-5.6v25.7c0 0 3.5 2 10 2 6.5 0 10-2 10-2v-25.7" fill="#83bf4f"/><path d="m22.4 16.6l1.4 2.6h25.1l1.1-2.8c0-10-2.4-14.3-13.5-14.4-11.3-.1-14.1 4.4-14.1 14.6" fill="#231f20"/><path d="m49 16.5c-.1.6-.2 1.1-.4 1.4-.3.6-.9.9-.9.9s.2-1.1.1-2.7c-.6-9.3-1.2-4.8-11.4-4.8-10.2 0-10.8-4.5-11.4 4.8-.1 1.6.1 2.7.1 2.7s-.6-.3-.9-.9c-.2-.3-.3-.9-.4-1.4-1-.3-2.2 0-2.2 2.8 0 1.7.6 3.2 2.8 3.3.8 5.8 8.5 9.7 12 9.7 3.5 0 11.3-3.9 12-9.7 2.1-.2 2.8-1.6 2.8-3.3 0-2.9-1.3-3.1-2.2-2.8" fill="#b47d56"/><g fill="#664e27"><circle cx="31.1" cy="19.5" r="2.2"/><circle cx="41.6" cy="19.5" r="2.2"/><path d="m40.4 26.7c0 1.5-2 2.3-4 2.3-2 0-4-.8-4-2.3 0 0 0-.4.4-.4 1.8 0 5.4 0 7.2 0 .4 0 .4.4.4.4"/></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></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(28.3837,29.2466)" id="g20"><path id="path22" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -2.42,0.003 -2.697,-1.999 l -1.299,-9.659 c -0.372,-2.182 2.132,-2.637 3.64,-2.668 1.506,-0.032 2.761,1.112 2.8,2.555 l 0.104,3.046 0.153,4.488 0.046,1.449 C 2.747,-1.579 2.226,-0.288 0,0"/></g><g transform="translate(30.1458,25.561)" id="g24"><path id="path26" style="fill:#90603e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.159,0.007 C -0.633,0.026 -1.037,-0.346 -1.057,-0.82 L -1.13,-3.327 0.635,-3.655 0.767,-0.551 C 0.646,-0.242 0.352,-0.014 0,0"/></g><g transform="translate(29.25,14.0937)" id="g28"><path id="path30" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3.594,0 -0.5,1.656 4.594,0 L 0,0 Z"/></g><g transform="translate(20.4241,28.4945)" id="g32"><path id="path34" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0.144,0.764 1.347,0.68 L 1.015,-0.37 0,0 Z"/></g><g transform="translate(29,33.6348)" id="g36"><path id="path38" style="fill:#6d6e71;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0.754 -0.611,1.365 -1.365,1.365 l -4.27,0 C -6.389,1.365 -7,0.754 -7,0 l 0,-15.27 c 0,-0.754 2.611,-1.365 3.365,-1.365 l 2.27,0 c 0.754,0 1.365,0.611 1.365,1.365 L 0,0 Z"/></g><g transform="translate(28,33.6348)" id="g40"><path id="path42" style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0.754 -0.611,1.365 -1.365,1.365 l -4.27,0 C -6.389,1.365 -7,0.754 -7,0 l 0,-15.27 c 0,-0.754 0.611,-1.365 1.365,-1.365 l 4.27,0 c 0.754,0 1.365,0.611 1.365,1.365 L 0,0 Z"/></g><path id="path44" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 22,20 5,0 0,13 -5,0 0,-13 z"/><g transform="translate(20.5464,21.8635)" id="g46"><path id="path48" style="fill:#90603e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.131,-0.745 0.536,0.045 0.599,0.043 c 0.49,0.034 0.884,0.37 1.022,0.812 L 0,0 Z"/></g><g transform="translate(20.5461,24.2552)" id="g50"><path id="path52" style="fill:#90603e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.02,-0.73 0.651,0.007 c 0.526,0.015 0.967,0.334 1.172,0.782 L 0,0 Z"/></g><g transform="translate(20.536,26.9047)" id="g54"><path id="path56" style="fill:#90603e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.011,-0.717 0.223,-0.031 c 0.524,-0.037 0.995,0.238 1.242,0.664 L 0,0 Z"/></g><g transform="translate(30.4039,24.1419)" id="g58"><path id="path60" style="fill:#90603e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.144,-0.067 C -0.574,-0.269 -1.09,-0.081 -1.292,0.348 L -2.055,1.98 c -0.201,0.43 -0.014,0.946 0.416,1.147 l 0.144,0.068 c 0.43,0.201 0.946,0.014 1.147,-0.416 L 0.416,1.147 C 0.617,0.718 0.43,0.201 0,0"/></g><g transform="translate(29.3262,19.8325)" id="g62"><path id="path64" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.159,0.007 C -0.633,0.026 -1.005,0.43 -0.986,0.904 l 0.162,3.936 c 0.02,0.474 0.424,0.846 0.898,0.827 L 0.233,5.66 C 0.707,5.641 1.079,5.237 1.06,4.762 L 0.898,0.827 C 0.878,0.353 0.474,-0.02 0,0"/></g><g transform="translate(29.8852,24.085)" id="g66"><path id="path68" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.144,-0.067 C -0.574,-0.269 -1.09,-0.081 -1.292,0.348 L -2.055,1.98 c -0.201,0.43 -0.014,0.946 0.416,1.147 l 0.144,0.068 c 0.43,0.201 0.946,0.014 1.147,-0.416 L 0.416,1.147 C 0.617,0.718 0.43,0.201 0,0"/></g><g transform="translate(30.8179,22.2202)" id="g70"><path id="path72" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.785,0.332 -1.639,0.124 -1.974,-0.114 -2.887,-2.043 -2.463,-5.208 -0.448,-5.645 1.63,-0.353 2.182,0.789 2.182,0.789 L -0.058,-1.699 0,0 Z"/></g><g transform="translate(20.7182,24.0984)" id="g74"><path id="path76" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.06,-0.002 c -0.181,-0.005 -0.333,0.139 -0.338,0.319 l -0.041,1.477 c -0.005,0.18 0.138,0.332 0.319,0.337 l 0.06,0.002 C 0.121,2.138 0.272,1.994 0.277,1.814 L 0.319,0.337 C 0.324,0.157 0.18,0.005 0,0"/></g><g transform="translate(20.6949,21.6307)" id="g78"><path id="path80" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 1.486,0.105 c 0,0 0.378,0.029 0.653,0.283 0.173,0.159 0.305,0.405 0.278,0.79 C 2.346,2.18 1.344,2.109 1.344,2.109 L 0.94,2.081 0.342,2.039 -0.142,2.004 0,0 Z"/></g><g transform="translate(20.7134,21.632)" id="g82"><path id="path84" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.037,-0.003 c -0.175,-0.012 -0.328,0.121 -0.341,0.296 l -0.097,1.368 c -0.012,0.175 0.121,0.328 0.296,0.341 l 0.037,0.002 C 0.033,2.017 0.186,1.884 0.199,1.709 L 0.296,0.341 C 0.308,0.166 0.175,0.012 0,0"/></g><g transform="translate(20.8462,21.2102)" id="g86"><path id="path88" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.187,-1.693 0.572,0.049 c 0,0 0.291,0.037 0.513,0.236 0.156,0.139 0.278,0.355 0.24,0.704 C 1.418,0.142 0.571,0.049 0.571,0.049 L 0,0 Z"/></g><g transform="translate(21.0492,19.5195)" id="g90"><path id="path92" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.031,-0.004 c -0.147,-0.021 -0.285,0.082 -0.306,0.23 l -0.162,1.151 c -0.021,0.147 0.083,0.284 0.23,0.305 l 0.031,0.005 c 0.147,0.02 0.285,-0.083 0.306,-0.23 L 0.23,0.306 C 0.251,0.158 0.147,0.021 0,0"/></g><g transform="translate(21.3389,26.6516)" id="g94"><path id="path96" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0.358,-0.018 0.673,0.169 0.901,0.304 1.107,0.544 1.138,0.99 1.212,2.054 0.148,2.128 0.148,2.128 L -0.384,2.165 -0.532,2.176 -0.68,0.047 0,0 Z"/></g><g transform="translate(20.6887,26.6968)" id="g98"><path id="path100" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.06,0.004 c -0.18,0.013 -0.317,0.17 -0.305,0.35 l 0.102,1.474 c 0.013,0.18 0.171,0.317 0.351,0.304 L 0.148,2.128 C 0.328,2.116 0.465,1.958 0.452,1.778 L 0.35,0.305 C 0.338,0.125 0.18,-0.013 0,0"/></g><g transform="translate(21.7355,24.1269)" id="g102"><path id="path104" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0.358,0.017 0.653,0.234 0.867,0.391 1.049,0.649 1.036,1.096 1.006,2.162 -0.06,2.133 -0.06,2.133 L -0.593,2.118 -1.107,2.103 -1.048,-0.029 0,0 Z"/></g><g transform="translate(29.25,15)" id="g106"><path id="path108" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -3.792,0 C -4.203,0 -4.375,-0.203 -4.99,-1.211 l -4.382,-6.699 -13.378,3.039 0,-10.129 16.365,0 c 1.333,0 2.533,0.307 3.035,1.542 L 1.283,-1.832 C 1.708,-0.5 0.947,0 0,0"/></g></g></g></g></svg>