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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f478-1f3fd.svg b/public/emoji/1f478-1f3fd.svg
index 7d5b77783..6fdfb919b 100644
--- a/public/emoji/1f478-1f3fd.svg
+++ b/public/emoji/1f478-1f3fd.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="M32,2C13.9,2,4,13.4,4,28.5V62h56V28.5c0-22.4-15.2-22-15.2-22S43.7,2,32,2z" fill="#594640"/><path d="m10.4 40.7c0 0-4.4-1.1-4.4-7.5 0-5.1 3.3-5.9 3.3-5.9 30.2-.1 38.7-6.3 38.7-6.3s1.9 6.2 6.6 6.2c0 0 3.4.6 3.4 5.9 0 6.4-4.5 7.5-4.5 7.5-.1 9.7-13.4 21.4-21.5 21.4-8.1 0-21.6-11.7-21.6-21.3" fill="#d6a57c"/><path d="m32 47c-4.2 0-6.3-3-4.2-3s6.3 0 8.4 0c2.1 0 0 3-4.2 3" fill="#b58360"/><path d="m38.3 38.2c-1.5 0-1.3-1.8-1.3-1.8 2.2-11.5 15-5.4 15-5.4 1 2-2.3 6.9-3.2 7.2-4.2 1-10.5 0-10.5 0" fill="#f5f5f5"/><path d="m48.5 33.5c0 2.5-2 4.5-4.5 4.5-2.5 0-4.5-2-4.5-4.5 0-2.5 2-4.5 4.5-4.5 2.5 0 4.5 2 4.5 4.5" fill="#6235a8"/><circle cx="44" cy="33.5" r="1.5" fill="#2b2925"/><path d="m37 36.3c2.2-13.7 13.5-4.6 18-6.5-4.5 4.3-13.5-4.9-18 6.5" fill="#3b3226"/><path d="m25.7 38.2c1.5 0 1.3-1.8 1.3-1.8-2.2-11.5-15-5.4-15-5.4-1 2 2.3 6.9 3.2 7.2 4.2 1 10.5 0 10.5 0" fill="#f5f5f5"/><path d="m15.5 33.5c0 2.5 2 4.5 4.5 4.5 2.5 0 4.5-2 4.5-4.5 0-2.5-2-4.5-4.5-4.5-2.5 0-4.5 2-4.5 4.5" fill="#6235a8"/><path d="m27 36.3c-2.2-13.7-13.5-4.6-18-6.5 4.5 4.3 13.5-4.9 18 6.5" fill="#3b3226"/><path d="M32,52l-10-1.5c6,8.5,14,8.5,20,0L32,52z" fill="#b5607c"/><path d="m35.9 50.1c-2.9-1.1-3.9.7-3.9.7s-1-1.8-3.9-.7c-2.3.9-6.1.4-6.1.4 4 .9 4.5 2.5 10 2.5s6-1.7 10-2.5c0 0-3.8.5-6.1-.4" fill="#804458"/><circle cx="20" cy="33.5" r="1.5" fill="#2b2925"/><path d="m57.9 14.3c-.8-.4-1.9-.1-2.5.7-.2-.9-.7-1.6-1.3-2.1.6 0 .8-.3.6-.7-.2-.7-.5-1.5-1.9-2.5 0-1.6-1.2-3.1-1.2-3.1-.2-.2-.6-.2-.8.1 0 .1-.9 1.6-.5 3.3-1.5 1.3-1.4 2.7-1.3 3-.2 0-1.7 1-2.1 2.9-.8 0-1.3.6-1.3.6.3-2.2-1.4-4.4-4-4.3-.7-3.9-5.1-5.2-5.9-1.4-.5-1-1.6-1.8-1.6-1.8.4-1.9-1.2-5-2.1-5s-2.4 3.1-2.1 5c0 0-1.1.8-1.7 1.7-.8-3.8-5.3-2.5-5.9 1.4-2.6-.1-4.3 2-4 4.3 0 0-.5-.5-1.3-.6-.4-1.9-1.8-2.9-2.1-2.9.1-.2.2-1.7-1.3-3 .4-1.7-.5-3.2-.5-3.3-.2-.3-.6-.3-.8-.1 0 0-1.2 1.5-1.2 3.1-1.4.9-1.7 1.7-1.9 2.5-.1.4.1.8.6.7-.6.5-1 1.2-1.3 2.1-.5-.7-1.6-1-2.5-.6-1 .5-1.3 1.8-.8 2.9.6 1.4 2.4 1.5 3.3.5.4 2.2 2.7 3.1 4.5 1.6-.3 1 1.4 1 3.2-.6.6.4 1.7.3 2.1.1-.1 1.2.5 3.1 2.6 3.1 1.4 0 2-1 1.9-1.8.8.3 2.3.6 3.4-.1 2.1 1.8 3.6 2.1 3.7 1 .6.5 1.4.8 2.1.8.8 0 1.5-.3 2.1-.8.1 1 1.6.8 3.7-1 1.1.7 2.5.5 3.4.1-.1.9.5 1.9 1.9 1.9 2 0 2.6-1.9 2.6-3.1.4.2 1.5.2 2.1-.1 1.9 1.6 3.5 1.5 3.2.6 1.8 1.5 4.1.6 4.5-1.6.9 1 2.7.9 3.3-.5.5-1.2.1-2.4-.9-3m-47.5-2.4c.2-.7.9-1.1.9-1.1l.2.8c-.1 0-.6.4-1.1.3m2.3-2.6h-.6c0 0 .1-.9.5-1.3.2.6.1 1.3.1 1.3m.1 2.5l.4-.8c0 0 .5.5.6 1.3-.5 0-1-.5-1-.5m.8 1.5c.2 0 .7.1.7.1s-.2.3-.3.8c0-.2-.3-.8-.4-.9m.5 5.8c.2-.9.7-1.5.7-1.5l.7.7c-.1-.1-.7.6-1.4.8m1-3.1c0 0-.2-.9 0-1.7.6.5.9 1.4.9 1.4l-.9.3m1.7 1.8l.2-.9c0 0 .8.2 1.3.9-.6.3-1.5 0-1.5 0m22.2-2.5c-.5-1.1.1-2 2-2.1.8 3.3-1.6 2.9-2 2.1m-7-9.9c.5 0 1.1 2.5 1 3.4h-2c-.1-.9.5-3.4 1-3.4m-9 7.9c1.9.1 2.5 1 2 2.1-.4.7-2.8 1.1-2-2.1m-2.8 3.6c-.3.3-1 0-1-1.4 1.3.4 1.3 1.1 1 1.4m2.4 2.1c-.3-1-1-1.4-1.4-1.6.7-1.1.1-2.3-1.8-2.8.9-1.1 1.5-1.5 2.5-1.5-.7 3.1 1 4.6 3.2 3.3 0 .2 0 .3 0 .5-1 .3-1.8 1.1-2.5 2.1m1 .3c.3-.7 1.6-1.4 1.6-1.4l.4 1.2c0 .1-1 .5-2 .2m2.4-4.7c-.1-1.1-.3-1.9-2.7-2.4.8-3.5 3.6-3.3 3.9-1.6.2 1.2-1.4 1.6-1-.1.2-.6-.7-.9-1-.3-.3.8-.4 3.1 2.1 2.1-.2.6-.5.9-.3 1.2-.2.2-.6.6-1 1.1m1.2.2c.4 1 .2 2.2.2 2.2l-1.2-.2c0-.1.3-1.2 1-2m-.2 4.6l.8-.9c0 0 .8.8 1 1.9-.9-.1-1.8-1-1.8-1m1.4-3.8c0-.8-.5-1.6-.5-1.6h1.3c0 0-.6.7-.8 1.6m-.3-2.6c.3-1.5 2.2-2.7 2.2-2.7l1 1.8c0 0-1.3 1-3.2.9m3.9-1.9c-.2-.3-.5-.7-.7-1.2.2 0 1.1 0 1.3 0-.1.5-.4.9-.6 1.2m.7 1l1-1.8c0 0 2 1.3 2.2 2.7-1.9.1-3.2-.9-3.2-.9m2.1 1.9h1.3c0 0-.4.8-.5 1.6-.2-.9-.8-1.6-.8-1.6m.4 6.4c.2-1.1 1-1.9 1-1.9l.8.9c0 0-.9.9-1.8 1m1.4-3.5c0 0-.2-1.1.2-2.2.7.8 1 1.9 1 1.9l-1.2.3m.4-3.3c.2-.3-.1-.7-.3-1.2 2.5 1.1 2.4-1.2 2.1-2.1-.2-.6-1.1-.3-1 .3.4 1.6-1.3 1.2-1 .1.3-1.7 3.2-1.9 3.9 1.6-2.4.4-2.6 1.3-2.7 2.4-.4-.6-.8-1-1-1.1m1.4 5.6l.4-1.2c0 0 1.3.6 1.6 1.4-1 .2-2-.2-2-.2m4.4-1.8c-.4.2-1.1.6-1.4 1.6-.6-1-1.4-1.8-2.5-2.1 0-.2 0-.3 0-.5 2.2 1.3 4-.2 3.2-3.3 1 0 1.7.4 2.5 1.5-1.9.5-2.5 1.7-1.8 2.8m1-.5c-.3-.3-.3-1 1-1.4 0 1.4-.7 1.7-1 1.4m1.9.9c.6-.8 1.3-.9 1.3-.9l.2.9c0 0-.9.3-1.5 0m3.2-3.5c.2.7 0 1.7 0 1.7l-.9-.3c.1 0 .3-.9.9-1.4m-.3 3.9l.7-.7c0 0 .5.7.7 1.5-.8-.1-1.4-.8-1.4-.8m1.3-4.1c-.1-.5-.3-.8-.3-.8s.5 0 .7-.1c0 .2-.3.8-.4.9m.3-1.8c.1-.8.6-1.3.6-1.3l.4.8c0 0-.5.5-1 .5m1.1-3c0 0-.1-.8.2-1.3.4.4.5 1.3.5 1.3h-.7m1.3 2.3l.2-.8c0 0 .6.4.9 1.1-.6.1-1.1-.3-1.1-.3" fill="#fff"/><g fill="#ff5760"><path d="m56.5 17.3c-.5-.3-.7-.9-.4-1.5.3-.6.9-.8 1.4-.5.5.3.7.9.4 1.5-.3.5-.9.8-1.4.5"/><path d="m44.5 20.4c-.6.8-1.5 1-2.1.5-.6-.5-.6-1.5-.1-2.3.6-.8 1.5-1 2.1-.5.7.5.7 1.6.1 2.3"/><path d="m54.6 15.9c.2 1.5-.5 2.9-1.6 3.1-1.1.2-2.2-.9-2.4-2.5-.2-1.5.5-2.9 1.6-3.1 1.1-.2 2.2.9 2.4 2.5"/><path d="m7.5 17.3c.5-.3.6-.9.4-1.5-.3-.5-.9-.8-1.4-.5-.5.3-.7.9-.4 1.5.3.5.9.8 1.4.5"/><ellipse cx="32" cy="17.2" rx="3" ry="3.8"/><path d="m19.5 20.4c.6.8 1.5 1 2.1.5.6-.5.6-1.5.1-2.3-.6-.8-1.5-1-2.1-.5-.7.5-.7 1.6-.1 2.3"/><path d="m9.4 15.9c-.2 1.5.5 2.9 1.6 3.1 1.1.2 2.2-.9 2.4-2.5.2-1.5-.5-2.9-1.6-3.1-1.1-.2-2.2.9-2.4 2.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(18,32.0005)" id="g20"><path id="path22" style="fill:#963b22;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 6,0 16,-3 16,-16 0,-13 0,-16 -3,-16 -3,0 -7,3 -13,3 -6,0 -9.915,-3 -13,-3 -3.343,0 -3,12 -3,16 0,13 10,16 16,16"/></g><g transform="translate(6,16.4375)" id="g24"><path id="path26" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,8.526 5.373,15.438 12,15.438 18.627,15.438 24,8.526 24,0 24,-8.525 18.627,-15.438 12,-15.438 5.373,-15.438 0,-8.525 0,0"/></g><g transform="translate(18,5)" id="g28"><path id="path30" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.347,0 -3.575,1.16 -3.707,1.293 -0.391,0.391 -0.391,1.023 0,1.414 0.387,0.388 1.013,0.39 1.404,0.01 C -2.251,2.67 -1.497,2 0,2 1.519,2 2.273,2.689 2.305,2.719 2.704,3.093 3.332,3.082 3.713,2.689 4.092,2.297 4.093,1.679 3.707,1.293 3.575,1.16 2.347,0 0,0"/></g><g transform="translate(19,10)" id="g32"><path id="path34" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L 0,2 C 0.553,2 1,1.553 1,1 1,0.447 0.553,0 0,0"/></g><g transform="translate(3.0645,11)" id="g36"><path id="path38" style="fill:#963b22;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.03,0.325 -0.064,0.648 -0.064,1 0,5.001 3,-0.563 3,3 0,3.564 2,4.001 4,6.001 l 3,3 c 0,0 5,-3 9,-3 4,0 8,-2.001 8,-6.001 0,-4 3,2.001 3,-3 0,-0.355 -0.034,-0.673 -0.058,-1 l 1.049,0 c 0.009,1.477 0.009,3.132 0.009,5 0,13 -10,18 -16,18 -6,0 -16,-5 -16,-18 0,-1.158 -0.029,-2.986 0.012,-5 L 0,0 Z"/></g><g transform="translate(8,30)" id="g40"><path id="path42" style="fill:#a7a9ac;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 20,0 20,1 17,2 15,5 12,4 10,6 8,4 5,5 3,2 0,1 0,0 Z"/></g><g transform="translate(17,32.5005)" id="g44"><path id="path46" style="fill:#f1f2f2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.829 0.448,1.5 1,1.5 1.553,1.5 2,0.829 2,0 2,-0.829 1.553,-1.5 1,-1.5 0.448,-1.5 0,-0.829 0,0"/></g><g transform="translate(13,32.0005)" id="g48"><path id="path50" style="fill:#f1f2f2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.552 0.448,1 1,1 1.552,1 2,0.552 2,0 2,-0.552 1.552,-1 1,-1 0.448,-1 0,-0.552 0,0"/></g><g transform="translate(21,32.0005)" id="g52"><path id="path54" style="fill:#f1f2f2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.552 0.447,1 1,1 1.553,1 2,0.552 2,0 2,-0.552 1.553,-1 1,-1 0.447,-1 0,-0.552 0,0"/></g><g transform="translate(13,13)" id="g56"><path id="path58" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.447 -1,1 l 0,2 C -1,3.553 -0.552,4 0,4 0.552,4 1,3.553 1,3 L 1,1 C 1,0.447 0.552,0 0,0"/></g><g transform="translate(23,13)" id="g60"><path id="path62" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.447 -1,1 l 0,2 C -1,3.553 -0.553,4 0,4 0.553,4 1,3.553 1,3 L 1,1 C 1,0.447 0.553,0 0,0"/></g></g></g></g></svg>