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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f40a.svg b/public/emoji/1f40a.svg
index d5dd7c6ab..1d3f3be01 100644
--- a/public/emoji/1f40a.svg
+++ b/public/emoji/1f40a.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="#64892f"><path d="m28.7 60.6l3-4.2c0 0-1.5-1-2.4-1.1-.9-.1-2.6.4-2.6.4l2 4.9"/><path d="m34.3 60.1l1.8-5c0 0-1.7-.5-2.6-.3-.9.2-2.3 1.2-2.3 1.2l3.1 4.1"/><path d="m39.5 58.9l1.3-5.2c0 0-1.7-.2-2.6 0-.9.3-2.2 1.6-2.2 1.6l3.5 3.6"/><path d="m57.8 45.9l-2-4.9c0 0-1.5 1.1-2 1.9-.5.8-.8 2.8-.8 2.8l4.8.2"/><path d="m60.9 38l-3.3-3.9c0 0-1.1 1.5-1.3 2.5-.2 1 0 2.9 0 2.9l4.6-1.5"/><path d="m62 28.6l-4.2-2.7c0 0-.7 1.8-.6 2.8 0 1 .8 2.8.8 2.8l4-2.9"/><path d="m60.7 19.8l-4.7-1.2c0 0-.1 2 .2 2.9.3.9 1.5 2.4 1.5 2.4l3-4.1"/><path d="m57.8 12.4l-4.8-.5c0 0 .1 2 .4 2.9.4.9 1.7 2.2 1.7 2.2l2.7-4.6"/><path d="m53.4 6.1l-4.5 1.8c0 0 .8 1.7 1.5 2.4.7.6 2.4 1.1 2.4 1.1l.6-5.3"/></g><path d="m26.4 44.7c-2-9.3-13.2-2.7-13 4.7.1 4.4-13.5 7.1-.2 7.1 3.1 0 5.4.6 6-5.6.2-2.2 9.4 3.7 7.2-6.2" fill="#769e2a"/><path d="m51 8.7c2.1.6 12.4 19.8 4.6 34.6-12.6 23.6-48.2 20.2-50.8-4.8-1.4-13.2 5.3-12.7 5.3-9-3.1-1.1-2.5 9.8 2.3 12.7 10.9 6.6 19.9-2 23-7.6 3.1-5.7.5-12.7.5-15.5s15.1-10.4 15.1-10.4" fill="#83b533"/><path d="m14.1 45.2c15.1 10.7 27.6-3.2 31.9-12.5 3.6-7.7 1.7-16.8.9-22.3-4.5 2.5-11.2 6.5-11.2 8.3 0 2.7 2.7 9.8-.5 15.5s-16.3 14.5-25.2 5.2c.9 2.1 2.6 4.7 4.1 5.8" fill="#ffd93b"/><g fill="#8cc63e"><path d="m53.5 48.2c-1.6-7.1-3.8-12-6.3-10.6s.6 10.1-2.9 15.8c-5.7 9.2 1.9 2.5 5.4 4.5 13.2 7.3 5.9-.4 3.8-9.7"/><path d="m54 49.3c-2.2-4.8-4.4-7.9-6-6.2-1.6 1.7 1.9 13.7 4.7 14.2 10.5 2.1 4.2-1.7 1.3-8"/></g><g fill="#d3b226"><path d="m36.8 27.1c1.8-.8 7.4-1.7 11-.6"/><path d="m36 32.5c1.9-.3 5.6.2 9 2.1"/><path d="m31.6 38.5c1.9.1 4.9 1 7.9 3.7"/><path d="m25.9 42c1.8.8 3.3 2.3 5.4 5.9"/><path d="m18 43.4c0 0 1 .4 1.5 4.6"/></g><path d="m34.7 37.6c0 1.4-.5 2.7-2 2.7s-2.8-1.1-2.8-2.5 2.8-3.8 4.3-3.8.5 2.2.5 3.6" fill="#769e2a"/><path d="m33.9 49.1c-2.2-10.2-14-3-13.8 5.2.1 4.9-14.4 7.7-.2 7.7 3.3 0 5.7.7 6.3-6.2.2-2.4 10 4.1 7.7-6.7" fill="#8cc63e"/><g fill="#64892f"><path d="m2 34.6l3.6 2.5c0 0 .6-1.6.6-2.5s-.6-2.5-.6-2.5l-3.6 2.5"/><path d="m2.8 41.1l4 1.5c0 0 .3-1.7.1-2.6-.2-.9-1.1-2.3-1.1-2.3l-3 3.4"/><path d="m4.9 47.3l4.2.5c0 0-.1-1.7-.4-2.5-.3-.8-1.5-1.9-1.5-1.9l-2.3 3.9"/><path d="m8.1 53.6l4.8-.7c0 0-.5-1.9-1-2.7-.5-.8-2.1-1.7-2.1-1.7l-1.7 5.1"/><path d="m13.9 58.8l4.3-2.4c0 0-1-1.6-1.7-2.2-.7-.5-2.5-.9-2.5-.9l-.1 5.5"/></g><path d="M50.6,11c1.9,1.8,6.1,6.3,3.7,10.2s-12.8,7.1-23.4,4.3S6,16.8,5.5,14.4s1.1-2.4,2.2-1.6S50.6,11,50.6,11z" fill="#83b533"/><ellipse cx="38.6" cy="7.6" rx="5.4" ry="5.6" fill="#8cc63e"/><ellipse cx="38.6" cy="7.6" rx="4.4" ry="4.6" fill="#fff"/><ellipse cx="38.6" cy="7.6" rx="3.1" ry="3.3" fill="#3e4347"/><path fill="#e8f94b" d="m7 12.1v3.3l2.2-1.2.2 2.5 2-1.7.9 3.4 2.6-2.1 1.3 3.6 3-2.5 1.7 4.3 5.3-3.7.4 5.3 3.8-3.4 1.9 4.8 3.4-4.5 2.6 5.2 3.2-5.2 2.8 5.1 1.8-5.3 3.9 3.4-.4-4.8 4.4 1.2-3.4-4.8 2.6-.2-2.7-2.7-17.2 4.5-17.4-2.4z"/><path d="m9.8 8.6c0 2.5-.7 2.4-1.6 2.4-.9 0-1.6.1-1.6-2.4 0-1.4.7-2.4 1.6-2.4.9-.1 1.6 1 1.6 2.4" fill="#8cc63e"/><ellipse cx="7.7" cy="8.6" rx=".6" ry="1.7" fill="#4b662b"/><g fill="#8cc63e"><path d="m4.5 10.7c-.3-6.3 16.2 6 36.9-2.3 5-2 9.8-.1 10.1 6.1.3 6.3-4.1 7.1-9.5 7.8-5.6.8-37.2-5.3-37.5-11.6"/><path d="m14.8 9.9c0 3.7-1 3.6-2.3 3.6-1.3 0-2.3.1-2.3-3.6 0-2 1-3.6 2.3-3.6 1.2 0 2.3 1.6 2.3 3.6"/></g><ellipse cx="12" cy="9.9" rx="1.3" ry="2.6" fill="#4b662b"/><ellipse cx="46.1" cy="7.6" rx="5.4" ry="5.6" fill="#8cc63e"/><ellipse cx="46.1" cy="7.6" rx="4.4" ry="4.6" fill="#fff"/><ellipse cx="46.1" cy="7.6" rx="3.1" ry="3.3" fill="#3e4347"/></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(19,4)" id="g20"><path id="path22" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1 -1.723,-3 -3.334,-3 -4.944,-3 -5,-1.657 -5,0 -5,1.657 -3.694,3 -2.084,3 -0.473,3 0,1.657 0,0"/></g><g transform="translate(30,4)" id="g24"><path id="path26" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1 -1.723,-3 -3.334,-3 -4.944,-3 -5,-1.657 -5,0 -5,1.657 -3.694,3 -2.084,3 -0.473,3 0,1.657 0,0"/></g><g transform="translate(36,11)" id="g28"><path id="path30" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,6 -3.172,9.171 -6,12 -1,1 -1.399,-0.321 -1,-1 0.508,-0.862 3,-8 -2,-8 l -2,0 c -5,0 -6.172,1.172 -9,4 -4.5,4.5 -7,0 -9,0 -6,0 -7,1.813 -7,-2 0,-3 3,-4 6,-4 3,0 3,-1 5,-4 1.071,-1.606 2.836,-3.211 5.023,-4.155 0.232,-1.119 2.774,-3.845 4.311,-3.845 1.61,0 1.666,1.343 1.666,3 l 5,0 c 0.034,0 0.066,0.01 0.101,0.01 C -8.608,-7.995 -8.313,-8 -8,-8 c 0,-1 1.723,-3 3.334,-3 1.61,0 1.666,1.343 1.666,3 0,0.302 -0.057,0.587 -0.137,0.861 C -1.388,-6.193 0,-4.209 0,0"/></g><g transform="translate(10,17.877)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.828 0.671,-1.5 1.5,-1.5 2.329,-1.5 3,-0.828 3,0 3,0.829 2.329,0 1.5,0 0.671,0 0,0.829 0,0"/></g><g transform="translate(26,12)" id="g36"><path id="path38" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.553 0.672,-1 1.5,-1 2.328,-1 3,-0.553 3,0 3,0.553 2.328,1 1.5,1 0.672,1 0,0.553 0,0"/></g><g transform="translate(22,12)" id="g40"><path id="path42" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.553 0.672,-1 1.5,-1 2.328,-1 3,-0.553 3,0 3,0.553 2.328,1 1.5,1 0.672,1 0,0.553 0,0"/></g><g transform="translate(18,12)" id="g44"><path id="path46" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.553 0.672,-1 1.5,-1 2.328,-1 3,-0.553 3,0 3,0.553 2.328,1 1.5,1 0.672,1 0,0.553 0,0"/></g><g transform="translate(20,10)" id="g48"><path id="path50" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.553 0.672,-1 1.5,-1 2.328,-1 3,-0.553 3,0 3,0.553 2.328,1 1.5,1 0.672,1 0,0.553 0,0"/></g><g transform="translate(24,10)" id="g52"><path id="path54" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.553 0.672,-1 1.5,-1 2.328,-1 3,-0.553 3,0 3,0.553 2.328,1 1.5,1 0.672,1 0,0.553 0,0"/></g><g transform="translate(6,14)" id="g56"><path id="path58" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.389,0 -1,1 -1,1 L 1,1 C 1,1 0.389,0 0,0"/></g><g transform="translate(4,13.5313)" id="g60"><path id="path62" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.389,0 -1,1.469 -1,1.469 l 2,0 C 1,1.469 0.389,0 0,0"/></g><g transform="translate(2,13)" id="g64"><path id="path66" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.389,0 -1,2 -1,2 L 1,2 C 1,2 0.389,0 0,0"/></g></g></g></g></svg>