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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f30f.svg b/public/emoji/1f30f.svg
index 3766698ba..21b702ddb 100644
--- a/public/emoji/1f30f.svg
+++ b/public/emoji/1f30f.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="m62 32c0 16.6-13.4 30-30 30s-30-13.4-30-30c0-4.4.9-8.5 2.6-12.3l32-17.3c2.3.4 4.5 1 6.5 1.8l.7 1.5 1.2-.8c10 4.9 17 15.2 17 27.1" fill="#008db3"/><g fill="#ffc942"><path d="m7.5 20.9c.9 1.8 2.1-.6 2 1.2-.1 1.8 1.2 5.8 2 5.3.8-.5.8-3.5 2.1-3.8 1.4-.4 3.3-2.7 3.9-1.6.6 1 .4 2.9.9 2.5.5-.4 1.2 0 1.1 1.3-.1 1.3 1.1 3.1 1.5 3.8s-2.1-2-3.3-3.6c-1.2-1.6.9 3.4 2.4 5.3 1.5 1.9 7.4 3.2 8.9 4 1.5.8 5.7-1.5 4.1-1.4 0 0-3.7.5-5-.2s-4.4-.7-5-1.6c-.5-.9-.5-2.3-1.5-3.6-.9-1.3-1.5-3.6-.3-2.6s2.6 1.2 2.8.5c.2-.7-2.4-3-.8-4 1.6-1 3.2-.3 3.9-1 .8-.8 2.6-3.1 2.1-4.2-.4-1.1-.5-1.9 0-2.2.5-.3-2.5-.3-1.3-1.2 1.2-.9 2.5-1.6 2.6 0 .1 1.6 0 3.1.6 3.1.6 0 1.5-1.8 1.3-2.6-.3-.8.3-2.5 1.5-2.6 1.2-.1 2.6-2.1 2.9-4s.3-3.5-.6-3.3c-.8.2-.9-1 .3-2-1.5-.3-3-.4-4.6-.4-12.2 0-22.7 7.3-27.4 17.7 1 0 2.3.1 2.9 1.2"/><path d="m42.6 7.9c-.7 1.2 1.1-.5 2.3-3-.6-.3-1.2-.5-1.8-.8.1 1.1.1 2.9-.5 3.8"/><path d="m34.3 16.9c1.4-.9 3.6-.9 3.6-2.8s5.4-5.1 4.1-5c-1.3.1-3.8 2.5-3.8.9 0-1.6 0-4.6-.3-5.4-.4-.9-.2 4.4-.6 5.3-.4.9 0 4.2-1.1 4.6-1.2.4-3.2 1.3-3.2 2.5s-.1.8 1.3-.1"/><path d="m35.8 32.7c.7.6-.4 2.2.4 1.8.8-.3 1.7.6 2.1 0 .4-.5.5-.9 1.7.2 1.3 1 2.2.8 1.4 0-.8-.8-1.5-2.2-3.2-2.7 0 0-1.8-.2-3-.8 0 0-1.7-.9-2.3-.3-.5.6-.5-1.6-.9-1.2-.4.4.2 1.7-1 1.4-1.2-.3-1.6.1-1.9-.9s-2.1-.5-.7-1.2c1.4-.7 2.1-1 2.1-.4.1.6 1.4-.5.9-2.1-.5-1.5-1.9-1-1.8-3 0-.9-1.4.3-1.1 1.4.2 1.1-.3 1.3-.8 2.2-.6.9-2.7 2.9-3.2 2.9-.6 0-.4 1.1 0 1.8s2.4.8 2.8.9c.4.1.9-3.1 1-2.2.1.9.3 3.4.6 2.8.3-.6 1.4.2 1.4-.3s-.5-1.5.6-1c1.1.5 2.6.9 2.5.3-.2-.7 1.7-.2 2.4.4m-6.6-6.7c.5 2.1-.7 2.5-1.1 2.1s1-2.6 1.1-2.1"/><path d="m40.7 39.7c-1.7-1.5-2.4-3.9-2.8-4.2-.7-.6-.4 2-.6 2.6-.2.5-1.2-.6-1.6-.9-.5-.2-.2-.6 0-1 .2-.5-.9-.9-1.7-.7-.8.2-.8-.1-1.1.6s-.1 1.2-.9.8c-.8-.4-1.3.2-1.9.8-.6.6-.8.9-1 1.3-.2.5-3.4.2-3.4 1.7s1.3 2.7 1 3.8.2 2.3 1.2 1.8c1-.6 2.4-.4 2.8-.9.4-.5 3.1-1.2 3.5-.3.5.9 1 1.3 1.8 1.3s.9.8.9 1.3c0 .6 1.2.1 1.9.3.7.2 2.3.1 2.5-1.3.1-1.3.9-2.2 1.1-2.9s-.1-2.7-1.7-4.1"/><path d="m39.2 48.8c-.8-.1-.2 1.8.3 1.9.5.2.8-1.1.7-1.9 0-.6-.2.1-1 0"/><path d="m51.8 47.1c-.5.1-.9-1.3-1.3-1-.7.6.8 1.9 0 2.6-.8.7-1 1.9-1.7 2s-1.6 1-1 1.5c.6.5 1.6 0 1.9-1 .3-1 .6-1.4 1.3-1.7s.6-1.1 1.3-1.6c.7-.3 0-.8-.5-.8"/></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="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="M 18,36 C 8.059,36 0,27.941 0,18 l 0,0 C 0,8.059 8.059,0 18,0 l 0,0 c 9.941,0 18,8.059 18,18 l 0,0 c 0,9.941 -8.059,18 -18,18 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(36,18)" id="g20"><path id="path22" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-9.941 -8.059,-18 -18,-18 -9.941,0 -18,8.059 -18,18 0,9.941 8.059,18 18,18 C -8.059,18 0,9.941 0,0"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g transform="translate(7.6875,34.125)" id="g32"><path id="path34" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.325,-0.436 3.438,0 4.312,-0.312 5.187,-0.625 4.375,-1.062 5,-1.437 5.625,-1.812 5.812,-1.75 6.312,-1.562 c 0.5,0.187 0.875,0.889 1.25,0.625 0.375,-0.265 1.688,-0.029 2.001,-0.5 0.312,-0.472 0.75,-0.842 1.437,-0.5 0.688,0.341 3.313,0.661 4,0.236 0.688,-0.424 2.437,-0.5 3.125,-0.612 0.687,-0.111 2.437,-0.17 2.187,-0.46 C 20.062,-3.063 21,-2.875 20.5,-3.563 20,-4.25 18.062,-5.687 17.875,-5.5 c -0.188,0.188 -0.375,1.063 -1,1 -0.625,-0.062 -1.5,0.125 -1.562,-0.625 -0.063,-0.75 -1,-1.687 -0.313,-1.687 0.688,0 1.375,0.687 1.562,0 0.188,-0.688 0.063,-1.063 -0.125,-1.438 -0.187,-0.375 0.25,-0.375 -0.749,-0.625 -1,-0.25 -0.563,0.562 -1,-0.25 -0.438,-0.813 -1.438,-1.063 -1.188,-1.75 0.25,-0.688 0.438,-1.063 0.5,-1.625 0.063,-0.563 -0.625,-1.25 -1,-1.75 -0.375,-0.5 -0.812,-1 -1.375,-1.125 -0.562,-0.125 -1,-0.25 -1.312,-1.062 -0.313,-0.813 0.341,-2 -0.58,-1.875 -0.92,0.125 -1.42,0.687 -1.483,1.125 -0.062,0.437 -1,1.312 -1.063,1.562 -0.062,0.25 -1.25,1.125 -1.25,1.125 0,0 -0.75,-0.75 -0.75,-1.625 0,-0.875 0.25,-1.937 0.25,-1.937 0,0 -0.312,-0.438 -0.937,0.062 -0.625,0.5 -1.312,0.625 -1.625,1.313 -0.312,0.687 -0.687,1.874 -0.687,2.312 0,0.437 -0.751,1.375 -1.063,1.375 -0.313,0 -1.875,-0.188 -2,-0.438 -0.125,-0.25 -0.5,-0.687 -0.812,-1 -0.313,-0.312 -1.188,-1.437 -1.501,-1.25 -0.312,0.188 -1.562,0.875 -1.562,1.5 0,0.625 -0.875,0.25 -0.937,1.25 -0.063,1 -0.5,1.875 -0.625,0.938 -0.125,-0.938 -0.063,-1.25 0.312,-2.375 0.375,-1.125 0.625,-1.5 1.188,-1.75 0.562,-0.25 0.25,-0.687 1.187,-0.562 0.937,0.125 1.5,0.437 1.562,0.062 C -2,-17 -1.5,-17.705 -2.438,-18.321 -3.375,-18.937 -3.25,-19 -3.813,-19.562 c -0.562,-0.563 -1.124,-0.375 -1.124,-1.563 0,-1.187 0,-1.375 0.062,-2.375 0.063,-1 0.188,-1.937 -0.687,-2.437 -0.875,-0.5 -3.751,3 -4.001,5 -0.25,2 -1.312,8.687 -0.937,10.249 0.375,1.563 2.375,6.376 3.188,7.313 C -6.5,-2.438 -2,0.375 0,0"/></g><g transform="translate(15.9375,14.6875)" id="g36"><path id="path38" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.687 -0.5,-1.437 0,-2.125 0.5,-0.688 0.937,-0.688 1.375,-0.75 0.437,-0.063 1.688,0 0.688,0.812 C 1.062,-1.25 0.5,-1.875 0.625,-0.937 0.75,0 0,0 0,0"/></g><g transform="translate(22.9375,24.6875)" id="g40"><path id="path42" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.687 -0.5,-1.437 0,-2.125 0.5,-0.688 -1,-1.25 -0.562,-1.313 0.437,-0.062 2.312,0.188 1.312,1 -1,0.813 -0.25,0.563 -0.125,1.501 C 0.75,0 0,0 0,0"/></g><g transform="translate(18.3784,13.75)" id="g44"><path id="path46" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.437,0.826 0.934,0.812 1.434,0.437 0.5,-0.375 2,-1.062 1.188,-1.374 C 1.809,-1.25 2.049,-1.937 1.429,-1.25 0.809,-0.562 -0.497,-0.937 0,0"/></g><g transform="translate(22.3125,13.2412)" id="g48"><path id="path50" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.339,-0.175 0.875,-0.741 1.625,-0.679 0.75,0.063 0.688,-0.785 1.438,-0.767 0.75,0.017 1.437,-0.17 1.749,-0.545 0.313,-0.375 1.684,-0.938 0.905,-1 -0.78,-0.063 -1.092,0.5 -1.904,0.75 C 3,-1.991 2.938,-2.679 2.063,-2.179 1.187,-1.679 0.25,-2.401 0,-1.446 -0.25,-0.491 -0.737,0.38 0,0"/></g><g transform="translate(15.7153,8.5)" id="g52"><path id="path54" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.574,0.558 0.972,0.937 1.847,1.375 2.722,1.812 4.222,2.438 4.597,2.5 4.972,2.563 5.41,2.735 5.66,2.24 5.91,1.745 6.222,1.561 6.722,1.745 7.222,1.929 7.809,1.821 8.184,1.505 8.559,1.189 9.472,0.625 9.785,0 10.097,-0.625 10.722,-0.5 10.535,-1.25 10.347,-2 10.597,-3.188 9.91,-3.813 9.222,-4.437 8.785,-5.187 8.035,-5.562 7.285,-5.937 5.305,-5 5.305,-4.437 c 0,0.562 -0.72,1.025 -1.268,1.525 C 3.488,-2.412 3.163,-2.5 2.663,-2.875 2.163,-3.25 2.347,-3.625 1.722,-3.75 1.097,-3.875 -0.567,-5.187 -0.504,-4.187 -0.442,-3.188 0.403,-1.437 0,-0.875 -0.403,-0.312 -0.898,-0.874 0,0"/></g></g></g></g></svg>