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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f450-1f3fb.svg b/public/emoji/1f450-1f3fb.svg
index 3da933cf3..fc3e98804 100644
--- a/public/emoji/1f450-1f3fb.svg
+++ b/public/emoji/1f450-1f3fb.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="#ffe1bd"><path d="m2.9 26.8c-1 .8-1.2 2.3-.4 3.3l10.8 13.8 3.7-2.9-10.8-13.7c-.8-1.1-2.3-1.3-3.3-.5"/><path d="m25 34.8l3.9-3-12.3-15.8c-.8-1.1-2.4-1.3-3.5-.4-1.1.8-1.3 2.4-.4 3.5l12.3 15.7"/></g><path d="m13.1 15.6c-.1.1-.2.2-.3.3 1-.5 2.4-.3 3.1.6l12.3 15.7.7-.5-12.3-15.7c-.8-1-2.4-1.2-3.5-.4" fill="#e6b796"/><path d="m17 41.1l4-3.1-12.6-16.1c-.9-1.1-2.5-1.3-3.6-.5-1.1.9-1.3 2.5-.4 3.6l12.6 16.1" fill="#ffe1bd"/><path d="m4.8 21.4c-.1.1-.2.2-.3.3 1.1-.6 2.4-.3 3.2.7l7.8 10 1.5.5-8.6-11c-.8-1.2-2.5-1.4-3.6-.5" fill="#e6b796"/><path d="m20 36.6l4-3.1-12.6-16.1c-.9-1.1-2.5-1.3-3.6-.5-1.1.9-1.3 2.5-.4 3.6l12.6 16.1" fill="#ffe1bd"/><g fill="#e6b796"><path d="m7.8 17c-.1.1-.2.2-.3.3 1.1-.6 2.5-.3 3.2.7l8.9 11.3 1.5.5-9.6-12.3c-.9-1.2-2.6-1.4-3.7-.5"/><path d="m2.9 26.8c-.1.1-.2.2-.3.3 1-.5 2.2-.2 2.9.7l6.4 8.2 1.5.5-7.2-9.2c-.8-1.1-2.3-1.3-3.3-.5"/></g><path d="m32.3 18.5c-1.9-.9-4.2 1-4.5 5.6-.2 3.2-.1 4-1.8 5.3l-1.5-1.9c0 0-14.9 11.7-13.9 12.9 0 0 3.4 5.8 7.4 7.9 6 3.2 16.7-4 14.8-15.3-1.3-6.7 1.5-13.5-.5-14.5" fill="#ffe1bd"/><g fill="#e6b796"><path d="m32.3 18.5c-.4-.2-.7-.2-1.1-.2.1 0 .2.1.3.1 2 1 .9 4.5.5 7.5-.3 2.4-.5 4.9.1 7 2.6 9.6-6.1 16.4-12.4 15.9 6.3 1.2 15.9-5.7 13.2-15.7-.6-2.2-.4-4.5-.1-7 .4-3.1 1.5-6.6-.5-7.6"/><path d="m26.4 29c-3.5 1.2-7.8 7.6-2.7 12.5-4-5.1-.4-10 2.2-12 .3-.3.5-.5.5-.5"/></g><g fill="#ffe1bd"><path d="m61.1 26.7c1 .8 1.2 2.3.4 3.3l-10.8 13.8-3.7-2.8 10.8-13.8c.8-1.1 2.3-1.3 3.3-.5"/><path d="m39 34.7l-3.9-3 12.3-15.7c.8-1.1 2.4-1.3 3.5-.4 1.1.8 1.3 2.4.4 3.5l-12.3 15.6"/></g><path d="m50.9 15.5c.1.1.2.2.3.3-1-.5-2.4-.3-3.1.6l-12.3 15.8-.7-.5 12.3-15.7c.8-1.1 2.4-1.3 3.5-.5" fill="#e6b796"/><path d="m47 41l-4-3.1 12.6-16.1c.9-1.1 2.5-1.3 3.6-.5 1.1.9 1.3 2.5.4 3.6l-12.6 16.1" fill="#ffe1bd"/><path d="m59.2 21.3c.1.1.2.2.3.3-1.1-.6-2.4-.3-3.2.7l-7.8 10-1.5.5 8.6-11c.8-1.1 2.5-1.3 3.6-.5" fill="#e6b796"/><path d="m44 36.5l-4-3.1 12.6-16.1c.9-1.1 2.5-1.3 3.6-.5 1.1.9 1.3 2.5.4 3.6l-12.6 16.1" fill="#ffe1bd"/><g fill="#e6b796"><path d="m56.2 16.9c.1.1.2.2.3.3-1.1-.6-2.4-.3-3.2.7l-8.8 11.3-1.5.5 9.6-12.3c.8-1.2 2.5-1.4 3.6-.5"/><path d="m61.1 26.7c.1.1.2.2.3.3-1-.5-2.2-.2-2.9.7l-6.4 8.2-1.5.5 7.2-9.2c.8-1.1 2.3-1.3 3.3-.5"/></g><path d="m31.7 18.5c1.9-.9 4.2 1 4.5 5.6.2 3.2.1 4 1.8 5.3l1.5-1.9c0 0 14.9 11.7 13.9 12.9 0 0-3.4 5.8-7.4 7.9-6 3.2-16.7-4-14.8-15.3 1.3-6.8-1.5-13.6.5-14.5" fill="#ffe1bd"/><g fill="#e6b796"><path d="m31.7 18.5c.4-.2.7-.2 1.1-.2-.1 0-.2.1-.3.1-2 1-.9 4.5-.5 7.5.3 2.4.5 4.9-.1 7-2.6 9.6 6.1 16.4 12.4 15.9-6.3 1.2-15.9-5.8-13.2-15.8.6-2.2.4-4.5.1-7-.4-3.1-1.5-6.6.5-7.5"/><path d="m37.6 28.9c3.5 1.2 7.8 7.6 2.7 12.5 4-5.1.4-10-2.2-12-.3-.3-.5-.5-.5-.5"/></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(15.2813,15.7422)" id="g20"><path id="path22" style="fill:#e0aa94;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.906,3.719 c 0,0 0.003,-0.022 0.009,-0.061 l -3.783,8.113 c -0.285,0.612 -1.147,0.815 -1.924,0.452 l -0.062,-0.028 c -0.68,-0.318 -1.07,-0.964 -0.964,-1.53 0,0 -1.275,1.147 -2.024,0.797 l -0.059,-0.027 c -0.748,-0.35 -1.122,-1.137 -0.832,-1.758 l 0.533,-1.192 c -0.301,0.644 -1.19,0.866 -1.986,0.494 L -13.06,8.95 C -13.855,8.579 -14.257,7.756 -13.957,7.112 L -8.826,-6.038 -2.031,-6.25 0,0 Z"/></g><g transform="translate(33.8525,24.6919)" id="g24"><path id="path26" style="fill:#e0aa94;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.062,0.029 c -0.796,0.372 -1.685,0.15 -1.986,-0.494 l 0.533,1.193 c 0.29,0.621 -0.084,1.407 -0.832,1.757 l -0.059,0.027 c -0.749,0.35 -1.591,0.13 -1.882,-0.491 L -4.431,1.715 c 0.108,0.567 -0.283,1.213 -0.964,1.53 L -5.456,3.273 C -6.233,3.636 -7.095,3.434 -7.38,2.822 l -3.771,-8.089 c -0.02,0.066 -0.034,0.115 -0.034,0.115 l -2.021,-4.52 2.1,-5.528 5.872,0.213 6.13,13.149 C 1.197,-1.194 0.795,-0.371 0,0"/></g><g transform="translate(35.8086,20.3276)" id="g28"><path id="path30" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0.653,1.043 -0.454,1.558 -1.561,2.072 -1.937,0.9 -1.937,0.9 l -2.389,-5.142 c -0.141,0.164 -0.705,0.516 -0.866,0.671 l 3.315,7.136 c 0,0 0.653,1.044 -0.455,1.559 -1.107,0.514 -1.483,-0.658 -1.483,-0.658 l -3.119,-6.711 c -0.174,0.099 -0.63,0.327 -0.812,0.424 L -4.13,5.96 c 0,0 0.652,1.043 -0.455,1.557 C -5.691,8.032 -6.067,6.86 -6.067,6.86 l -3.619,-7.779 c -0.193,0.078 -0.796,0.334 -0.988,0.403 l 3.38,7.273 c 0,0 0.651,1.043 -0.455,1.557 -1.108,0.515 -1.483,-0.656 -1.483,-0.656 l -3.575,-7.689 -0.286,-0.617 -0.128,-0.276 c 3.323,-1.544 4.487,-5.617 3.2,-8.384 -0.257,-0.554 -1.176,-0.3 -1.176,-0.3 1.544,3.321 0.358,6.566 -2.964,8.109 l 0.143,4.546 c 0,0 0.134,1.213 -1.079,1.348 -1.215,0.134 -1.348,-1.08 -1.348,-1.08 l -0.509,-3.183 c -0.203,-1.262 -0.431,-2.525 -0.81,-3.746 -1.066,-3.447 0.552,-7.238 3.915,-8.803 3.669,-1.705 8.028,-0.112 9.733,3.556 0.09,0.195 0.257,0.556 0.257,0.556 L 0,0 Z"/></g><g transform="translate(0.1919,20.3276)" id="g32"><path id="path34" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -0.654,1.043 0.453,1.558 1.561,2.072 1.936,0.9 1.936,0.9 l 2.39,-5.142 c 0.14,0.164 0.705,0.516 0.866,0.671 L 1.877,3.565 c 0,0 -0.654,1.044 0.455,1.559 1.106,0.514 1.482,-0.658 1.482,-0.658 l 3.119,-6.711 c 0.175,0.099 0.63,0.327 0.813,0.424 L 4.129,5.96 c 0,0 -0.652,1.043 0.455,1.557 C 5.691,8.032 6.067,6.86 6.067,6.86 l 3.618,-7.779 c 0.193,0.078 0.797,0.334 0.988,0.403 l -3.38,7.273 c 0,0 -0.651,1.043 0.456,1.557 1.107,0.515 1.483,-0.656 1.483,-0.656 l 3.574,-7.689 0.286,-0.617 0.128,-0.276 c -3.323,-1.544 -4.486,-5.617 -3.2,-8.384 0.258,-0.554 1.177,-0.3 1.177,-0.3 -1.544,3.321 -0.359,6.566 2.963,8.109 l -0.142,4.546 c 0,0 -0.135,1.213 1.078,1.348 1.215,0.134 1.349,-1.08 1.349,-1.08 l 0.508,-3.183 c 0.203,-1.262 0.432,-2.525 0.811,-3.746 1.067,-3.447 -0.552,-7.238 -3.916,-8.803 -3.669,-1.705 -8.027,-0.112 -9.732,3.556 -0.09,0.195 -0.257,0.556 -0.257,0.556 L 0,0 Z"/></g></g></g></g></svg>