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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f479.svg b/public/emoji/1f479.svg
index 4aa1df93b..d08549995 100644
--- a/public/emoji/1f479.svg
+++ b/public/emoji/1f479.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" enable-background="new 0 0 64 64"><path d="m58 21.2c3.9-2.6 4-6.4 4-6.4-3.9-.2-3.8-4.2-7.4-7.8-6.9-7-20.5-4.7-22.6-1.5-2.1-3.2-15.7-5.5-22.6 1.5-3.6 3.7-3.5 7.7-7.4 7.8 0 0 .1 3.8 4 6.4 0 0-4.1 5.9-3.4 14.1 0 0 1.6-4 5.5-4.7-4.5 3.8-.9 14.4-4.2 18.2 0 0 4.6-2 6.5-3.3-.7 5.9.9 8.2.9 11.1 4.1-1.3 5.7-7.4 5.7-7.4 0 7.5 2.6 7.2 2.6 11.2 0 0 5.5-2.7 7.4-6.5.7 3.5 3.3 5.9 5.2 8.1 1.9-2.2 4.4-4.6 5.2-8.1 1.9 3.7 7.4 6.5 7.4 6.5 0-4 2.6-3.7 2.6-11.2 0 0 1.6 6 5.7 7.4 0-2.9 1.6-5.2.9-11.1 1.9 1.3 6.5 3.3 6.5 3.3-3.3-3.9.3-14.5-4.2-18.2 3.8.8 5.5 4.7 5.5 4.7.3-8.3-3.8-14.1-3.8-14.1" fill="#454749"/><path d="m52.1 31.9c0 5.5-5.5 8.6-5.5 15.1 0 9-9.9 1.5-14.5 1.5-4.8 0-14.8 7.4-14.8-1.7 0-6.3-5.3-9.5-5.3-14.9 0-2.5 2.7-5.7 2.8-7.8.2-3.8-2.3-7.8-2.1-10.2.8-12.9 19.3 6.1 19.3 6.1s18.5-19 19.4-5.9c.2 2.3-2.3 6.4-2.2 10.1.2 2 2.9 5.2 2.9 7.7" fill="#f46767"/><g fill="#ffce31"><path d="m23.1 9.3c-3.9-2.1-6.5-7.3-6.5-7.3s-4.3 14.8 5.4 15c3.2 0 5.7-5.3 1.1-7.7"/><path d="m40.9 9.3c3.9-2.1 6.5-7.3 6.5-7.3s4.3 14.8-5.5 15c-3.1 0-5.6-5.3-1-7.7"/></g><path d="m15.2 31.9c-3 5.2 3.1 7.5 3.1 11.8 0 9.6 6.1 2.7 13.7 2.7 7.6 0 13.7 7 13.7-2.7 0-4.4 6.2-6.5 3.1-11.8-2.7-4.8-1.9 5.8-16.8 5.8-15 0-14-10.6-16.8-5.8" fill="#454749"/><g fill="#fff"><path d="m17.4 32.8c-.3 0-.6.1-.9.2l-.2.1c-5.9 3.2-7 3.8-6.7 4.7.1.6.9.6 1.3.6 1.2 0 3.5-.4 7-.9 1.1-.2 1.8-1.1 1.7-2.3-.3-1.2-1.1-2.4-2.2-2.4"/><path d="m47.7 33.2l-.2-.1c-.3-.2-.6-.2-.9-.2-1.2 0-1.9 1.2-2 2.3-.1 1.2.5 2.1 1.7 2.3 3.5.6 5.8.9 7 .9.4 0 1.1 0 1.2-.6.2-.8-.9-1.4-6.8-4.6"/><path d="m42 44.9c-2 1.2.8 4.6 2.4 2.8 7.4-8.6 6.3-7.9-2.4-2.8"/><path d="m19.6 47.7c1.6 1.9 4.5-1.6 2.4-2.8-8.7-5.1-9.7-5.8-2.4 2.8"/><path d="m24.6 38.8c1.5-1.3-2.4-3-3.2-1.3-4 7.7-3.2 7 3.2 1.3"/><path d="m42.6 37.5c-.9-1.7-4.7 0-3.2 1.3 6.4 5.7 7.2 6.4 3.2-1.3"/><path d="m40.4 46.2c-.6.4-2.6.4-3.2 0-.6-.4-.5-2 0-2.5.6-.5 2.6-.5 3.2 0 .5.4.6 2.1 0 2.5"/><path d="m26.8 46.2c-.6.4-2.6.4-3.2 0-.6-.4-.5-2 0-2.5.6-.5 2.6-.5 3.2 0 .5.4.6 2.1 0 2.5"/></g><path d="m35.7 45.3c-1.3.8-6 .8-7.4 0-.7-.4 0-1.9.6-2.3 1.3-.8 4.9-.8 6.3 0 .6.4 1.2 1.9.5 2.3" fill="#bc2e2e"/><g fill="#fff"><path d="m26.3 37.9c2.2.9 9 1 11.4 0 1.2-.2 1 1.3 0 2-1.9 1.9-9.5 1.9-11.3 0-1.1-.7-1.2-2.1-.1-2"/><path d="m28 25c0 4.8-10.6 4.8-10.6 0 0-6.5 10.6-6.5 10.6 0"/></g><path d="m24.9 25c0 2.9-4.4 2.9-4.4 0 0-2.9 4.4-2.9 4.4 0" fill="#454749"/><path d="m46.6 25c0 4.8-10.6 4.8-10.6 0 0-6.5 10.6-6.5 10.6 0" fill="#fff"/><g fill="#454749"><path d="m43.5 25c0 2.9-4.4 2.9-4.4 0 0-2.9 4.4-2.9 4.4 0"/><path d="m11.7 17.5c0 0 5.8 2.2 10.7 5.9 5.7 4.3 8.5 1.4 6-1.6-1.8-2.4-7.5-6.2-16.7-4.3"/><path d="m35.6 21.7c-2.5 3.1.4 5.9 6 1.6 4.9-3.7 10.7-5.9 10.7-5.9-9.2-1.8-14.9 2-16.7 4.3"/></g><path d="m35.9 31.4c-.3-1.3-1.2-6.1-1.2-7.2.2-3.8-5.6-3.8-5.4 0 .1 1.1-.9 5.9-1.2 7.2-3.3-.3-5.1 3.9-.3 3.9 1.9 0 2.3 1.7 4.2 1.7s2.3-1.7 4.2-1.7c4.7 0 2.9-4.2-.3-3.9" fill="#bc2e2e"/></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(18,32)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-27 c 0,0 -19,-8 -12,1 -3,0 -6,-1 -6,2 0,3 4,5 4,5 0,0 -7,0 -1,8 0,0 -6,2.001 2,7 0,0 -6,6.072 7,3 0,0 0,5 2,5 2,0 4,-4 4,-4"/></g><g transform="translate(18,32)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-27 c 0,0 19,-8 12,1 3,0 6,-1 6,2 0,3 -4,5 -4,5 0,0 7,0 1,8 0,0 6,2.001 -2,7 0,0 6,6.018 -7,3 C 6,-1 6,4 4,4 2,4 0,0 0,0"/></g><g transform="translate(18,31)" id="g28"><path id="path30" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-30 -4,0 c -4,0 -4,1 -4,3 0,0 -3,3 -3,7 0,0 -1.711,1.111 -2,4 -0.271,2.709 1,5 2,5 0,0 0.279,6.519 4,9 3,2 4.911,2 7,2"/></g><g transform="translate(18,31)" id="g32"><path id="path34" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-30 3.963,0 c 4.037,0 4,1 4,3 0,0 3,3 3,7 0,0 1.711,1.111 2,4 0.271,2.709 -1,5 -2,5 0,0 -0.261,6.519 -3.981,9 C 3.982,0 2,0 0,0"/></g><g transform="translate(18,8.9111)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.8,0 6.333,1.022 7.178,1.467 8.022,1.911 8.867,1.123 8.6,-0.4 8.237,-2.474 7.478,-5.084 5.345,-4.595 4.645,-4.435 3.022,-2.911 0,-2.911 L 0,0 Z"/></g><g transform="translate(18,8.9111)" id="g40"><path id="path42" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -3,0 -6.508,1.022 -7.353,1.467 -8.197,1.911 -9.129,1.123 -8.862,-0.4 -8.5,-2.474 -7.609,-5.084 -5.476,-4.595 -4.776,-4.435 -3,-2.911 0,-2.911 L 0,0 Z"/></g><g transform="translate(25.7214,7.2587)" id="g44"><path id="path46" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.805,3 C -1.96,2.515 -5.147,1.652 -7.721,1.652 c -2.835,0 -6.121,0.913 -7.187,1.388 L -15.723,0 c -0.142,-0.531 0.176,-1.082 0.708,-1.225 0.531,-0.142 1.082,0.176 1.224,0.707 l 0.748,2.331 c 0.892,-0.343 3.114,-0.664 5.322,-0.66 2.161,0.004 4.308,0.324 5.18,0.66 l 0.616,-2.331 c 0.142,-0.531 0.689,-0.849 1.22,-0.707 C -0.174,-1.082 0.142,-0.531 0,0"/></g><g transform="translate(22.9294,6.0941)" id="g48"><path id="path50" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.086,0.404 -0.174,0.804 -0.578,0.889 -0.981,0.975 -1.381,0.715 -1.467,0.312 L -1.586,-0.331 C -1.937,-0.141 -3.425,0.315 -4.93,0.318 -6.483,0.32 -8.055,-0.137 -8.413,-0.331 L -8.612,0.312 C -8.697,0.715 -9.129,0.975 -9.532,0.889 -9.936,0.804 -10.211,0.404 -10.125,0 l 0.318,-1.514 c 0.916,0.479 2.51,1.42 4.878,1.42 2.254,0 3.728,-0.847 4.623,-1.345 L 0,0 Z"/></g><g transform="translate(13.4957,21.0158)" id="g52"><path id="path54" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2.38,0.506 c -1.636,0.348 -3.259,-0.707 -3.607,-2.343 -0.348,-1.636 0.707,-3.259 2.343,-3.607 l 2.38,-0.505 C 0.372,-6.297 1.995,-5.243 2.342,-3.607 2.69,-1.971 1.636,-0.348 0,0"/></g><g transform="translate(22.5043,21.2548)" id="g56"><path id="path58" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 2.38,0.506 C 4.016,0.854 5.639,-0.201 5.987,-1.837 6.335,-3.473 5.281,-5.096 3.644,-5.444 L 1.265,-5.949 c -1.637,-0.348 -3.26,0.706 -3.607,2.342 C -2.69,-1.971 -1.636,-0.348 0,0"/></g><g transform="translate(13.737,20.5296)" id="g60"><path id="path62" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.956,0.416 c -1.345,0.286 -2.68,-0.581 -2.965,-1.926 -0.286,-1.345 0.58,-2.679 1.925,-2.965 L -1.04,-4.891 C 0.305,-5.177 1.64,-4.31 1.926,-2.965 2.212,-1.62 1.345,-0.286 0,0"/></g><g transform="translate(14.2391,18.2922)" id="g64"><path id="path66" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.829 -0.672,-1.5 -1.5,-1.5 -2.329,-1.5 -3,-0.829 -3,0 -3,0.828 -2.329,1.5 -1.5,1.5 -0.672,1.5 0,0.828 0,0"/></g><g transform="translate(22.2631,20.5296)" id="g68"><path id="path70" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1.956,0.416 C 3.301,0.702 4.636,-0.165 4.921,-1.51 5.207,-2.855 4.341,-4.189 2.996,-4.475 L 1.04,-4.891 C -0.305,-5.177 -1.64,-4.31 -1.926,-2.965 -2.212,-1.62 -1.345,-0.286 0,0"/></g><g transform="translate(21.7609,18.2922)" id="g72"><path id="path74" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.829 0.672,-1.5 1.5,-1.5 2.329,-1.5 3,-0.829 3,0 3,0.828 2.329,1.5 1.5,1.5 0.672,1.5 0,0.828 0,0"/></g><g transform="translate(18,9.5)" id="g76"><path id="path78" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.86,0 -2.647,1.005 -2.901,1.855 -3.444,1.727 -4.246,1.646 -4.83,2.042 -5.135,2.249 -5.5,2.67 -5.5,3.5 -5.5,3.776 -5.276,4 -5,4 c 0.276,0 0.5,-0.224 0.5,-0.5 0,-0.474 0.173,-0.591 0.23,-0.63 0.374,-0.254 1.23,-0.046 1.585,0.095 0.153,0.06 0.329,0.042 0.466,-0.052 C -2.083,2.82 -2,2.666 -2,2.5 -1.997,2.351 -1.917,1 0,1 1.978,1 2,2.439 2,2.5 2,2.666 2.082,2.82 2.22,2.913 2.355,3.007 2.528,3.026 2.685,2.965 3.041,2.823 3.896,2.615 4.27,2.87 4.326,2.909 4.5,3.026 4.5,3.5 4.5,3.776 4.724,4 5,4 5.276,4 5.5,3.776 5.5,3.5 5.5,2.67 5.136,2.249 4.829,2.042 4.245,1.646 3.443,1.727 2.9,1.855 2.648,1.005 1.859,0 0,0"/></g><g transform="translate(23.6631,1.9053)" id="g80"><path id="path82" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.63,0 -1.292,0.273 -1.975,0.816 -0.96,0.765 -1.864,1.485 -3.688,1.485 -1.824,0 -2.729,-0.72 -3.687,-1.483 -1.186,-0.945 -2.439,-0.944 -3.625,-0.002 -0.215,0.172 -0.251,0.488 -0.079,0.704 0.171,0.215 0.486,0.251 0.702,0.08 0.822,-0.655 1.556,-0.655 2.377,0 1.004,0.797 2.139,1.701 4.312,1.701 2.174,0 3.308,-0.904 4.309,-1.7 0.579,-0.46 1.096,-0.655 1.532,-0.587 0.476,0.075 0.728,0.449 0.738,0.465 0.151,0.228 0.46,0.295 0.69,0.147 C 1.836,1.477 1.906,1.174 1.761,0.942 1.712,0.865 1.261,0.184 0.357,0.03 0.239,0.01 0.12,0 0,0"/></g><g transform="translate(13.8599,26.5112)" id="g84"><path id="path86" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.028,0.049 0.051,0.101 0.071,0.156 0.254,0.668 0.024,1.236 -0.483,1.431 -0.51,1.441 -2.86,2.524 -5.86,8.879 l 0,0.002 0,0.002 c 0,0.058 -0.109,0.1 -0.143,0.151 C -6.04,9.089 -6.087,9.151 -6.134,9.198 -6.224,9.287 -6.34,9.357 -6.455,9.407 -6.486,9.42 -6.53,9.42 -6.564,9.43 c -0.088,0.028 -0.18,0.053 -0.274,0.055 -0.007,0 -0.014,0.004 -0.02,0.004 -0.049,0 -0.091,-0.021 -0.138,-0.028 C -7.063,9.453 -7.129,9.455 -7.194,9.432 -7.204,9.428 -7.211,9.42 -7.221,9.417 -7.279,9.394 -7.327,9.356 -7.379,9.323 -7.436,9.288 -7.495,9.258 -7.543,9.213 -7.583,9.175 -7.61,9.127 -7.644,9.083 -7.686,9.027 -7.73,8.974 -7.76,8.91 -7.783,8.862 -7.791,8.809 -7.806,8.756 -7.826,8.685 -7.846,8.615 -7.85,8.54 -7.851,8.522 -7.86,8.507 -7.86,8.489 c 0,-0.268 0.063,-6.603 5.486,-9.857 0.161,-0.097 0.338,-0.143 0.513,-0.143 0.176,0 0.349,0.049 0.501,0.136 0.018,-0.009 0.035,-0.021 0.053,-0.03 0.143,-0.072 0.296,-0.106 0.446,-0.106 0.367,0 0.72,0.202 0.896,0.553 C 0.192,-0.642 0.167,-0.283 0,0"/></g><g transform="translate(29.9902,35.0503)" id="g88"><path id="path90" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.004,0.075 -0.023,0.145 -0.044,0.216 -0.059,0.269 -0.067,0.323 -0.09,0.372 -0.119,0.434 -0.162,0.484 -0.203,0.539 -0.237,0.585 -0.266,0.635 -0.308,0.674 -0.354,0.717 -0.41,0.746 -0.464,0.78 -0.519,0.814 -0.568,0.854 -0.629,0.877 -0.639,0.881 -0.646,0.889 -0.655,0.893 -0.721,0.916 -0.786,0.913 -0.853,0.922 -0.898,0.929 -0.939,0.95 -0.987,0.95 l -0.003,0 C -0.997,0.95 -1.002,0.946 -1.009,0.946 -1.111,0.944 -1.209,0.918 -1.306,0.886 -1.33,0.877 -1.358,0.878 -1.383,0.868 -1.611,0.771 -1.805,0.589 -1.909,0.344 -4.635,-6.015 -7.301,-7.098 -7.307,-7.101 -7.83,-7.276 -8.113,-7.842 -7.938,-8.366 c 0.021,-0.065 0.048,-0.127 0.082,-0.184 -0.163,-0.281 -0.185,-0.635 -0.029,-0.947 0.176,-0.351 0.529,-0.553 0.896,-0.553 0.15,0 0.302,0.034 0.446,0.106 0.019,0.009 0.034,0.021 0.053,0.03 0.152,-0.087 0.325,-0.136 0.501,-0.136 0.175,0 0.352,0.047 0.513,0.143 5.423,3.254 5.486,9.59 5.486,9.858 C 0.01,-0.032 0.001,-0.017 0,0"/></g><g transform="translate(15,20)" id="g92"><path id="path94" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4.254,0 -7.422,2.08 -7.555,2.168 -0.459,0.306 -0.583,0.927 -0.277,1.387 0.306,0.458 0.926,0.583 1.385,0.278 C -6.419,3.815 -3.628,2 0,2 0.552,2 1,1.552 1,1 1,0.448 0.552,0 0,0"/></g><g transform="translate(21,20)" id="g96"><path id="path98" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.448 -1,1 0,0.552 0.447,1 1,1 3.655,0 6.418,1.814 6.445,1.832 0.46,0.307 1.08,0.183 1.387,-0.277 C 8.139,3.095 8.015,2.474 7.555,2.168 7.422,2.08 4.254,0 0,0"/></g></g></g></g></svg>