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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f68d.svg b/public/emoji/1f68d.svg
index d2d2f59c7..7bde4113e 100644
--- a/public/emoji/1f68d.svg
+++ b/public/emoji/1f68d.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="#3e4347"><path d="m11 57v3c0 1.1.9 2 2 2h4c1.1 0 2-.9 2-2v-3h-8"/><path d="m45 57v3c0 1.1.9 2 2 2h4c1.1 0 2-.9 2-2v-3h-8"/></g><path d="M56,54c0,1.7-1.3,3-3,3H11c-1.7,0-3-1.4-3-3V7.7c0-1.7,1.3-3,3-3h42c1.7,0,3,1.3,3,3V54z" fill="#c5d0d8"/><path d="m56 54c0 1.7-1.3 3-3 3h-42c-1.7 0-3-1.4-3-3v-6h48v6" fill="#428bc1"/><g fill="#3e4347"><path d="M54.7,35.5c0,1.7-1.3,3-3,3H12.3c-1.7,0-3-1.3-3-3V17.8c0-1.7,1.3-3,3-3h39.4c1.7,0,3,1.4,3,3V35.5z"/><path d="m10.6 49.5h8.9v6h-8.9z"/></g><path fill="#f15744" d="m12 51h5.9v3h-5.9z"/><path fill="#3e4347" d="m44.6 49.5h8.9v6h-8.9z"/><path fill="#f15744" d="m46 51h5.9v3h-5.9z"/><path d="m48 11.5c0 1-.8 1.8-1.8 1.8h-28.4c-1 0-1.8-.8-1.8-1.8v-3.6c0-1 .8-1.8 1.8-1.8h28.4c1 0 1.8.8 1.8 1.8v3.6" fill="#3e4347"/><path d="m16.1 4.7c0-1.5.8-2.7 1.8-2.7h28.4c1 0 1.8 1.2 1.8 2.7-.1 0-32 0-32 0" fill="#b2c1c0"/><path fill="#3e4347" d="m22 43.4h20v11.1h-20z"/><g fill="#62727a"><path d="m22.9 44.4h18.2v1h-18.2z"/><path d="m12.5 34.3h18.2v1h-18.2z"/><path d="m27.7 38.5l-7.2-3.7.6-.3 7.6 4z"/><path d="m33.3 34.3h18.2v1h-18.2z"/><path d="m48.5 38.5l-7.2-3.7.6-.3 7.5 4z"/><path d="m22.9 46.4h18.2v1h-18.2z"/><path d="m22.9 48.4h18.2v1h-18.2z"/><path d="m22.9 50.4h18.2v1h-18.2z"/><path d="m22.9 52.4h18.2v1h-18.2z"/></g><g fill="#fff"><ellipse cx="52.2" cy="43.5" rx="2.9" ry="2.9"/><ellipse cx="46" cy="43.5" rx="2.9" ry="2.9"/><ellipse cx="18" cy="43.5" rx="2.9" ry="2.9"/><ellipse cx="11.8" cy="43.5" rx="2.9" ry="2.9"/></g><g fill="#62727a"><path d="m8 24.8c0 .6-.4 1-1 1h-2c-.6 0-1-.4-1-1v-8c0-.6.4-1 1-1h2c.6 0 1 .4 1 1v8"/><path d="m5.8 16.7l-.7-.7 5.8-5.8v1.5z"/><path d="m56 24.8c0 .6.4 1 1 1h2c.6 0 1-.4 1-1v-8c0-.6-.4-1-1-1h-2c-.6 0-1 .4-1 1v8"/><path d="m58.2 16.7l.7-.7-5.8-5.8v1.5z"/></g><g fill="#c7e755"><path d="m20.5 8v1.3l-.4.4-.1-.1v-1.8l.5.2m-.6 3.7v-1.8l.1-.1.4.4v1.3l-.5.2m2.5.4h-2.2c-.2 0-.3-.2-.3-.3l.5-.2h1.8l.2.5m-.2-4.2h-1.8l-.5-.2c0-.2.2-.3.3-.3h2.2l-.2.5m0 1.6l.3.3-.3.2h-1.7l-.3-.3.3-.3h1.7z"/><path d="m23.6 8v1.3l-.4.4-.1-.1v-1.8l.5.2m0 2.2v1.4l-.2.5c-.2 0-.3-.2-.3-.3v-1.9l.1-.1.4.4m1.6-2.3h-1.6l-.5-.2c0-.2.2-.3.3-.3h2l-.2.5m-.4 1.6l-.3.3-.3-.3v-1.5h.5l.1 1.5m.6-.2v-1.4l.2-.5c.2 0 .3.2.3.3v1.9l-.1.1-.4-.4m.4.5l.1.1v1.9c0 .2-.2.3-.3.3l-.2-.5v-1.4l.4-.4"/><path d="m26.7 9.7l-.1-.1v-1.6l.3-.3.2.2v1.4l-.4.4m.4.5v1.4l-.2.2-.3-.3v-1.6l.1-.1.4.4m1.6-2.3h-1.5l-.2-.3.3-.3h1.5l.2.3-.3.3m.2 4l-.3.3h-1.5l-.1-.3.3-.3h1.5l.1.3m-.1-2.6v-1.4l.2-.2.3.3v1.5l-.1.1-.4-.3m.4.5l.1.1v1.5l-.3.4-.2-.2v-1.4l.4-.4"/><path d="m30 11.7v-1.8l.1-.1.4.4v1.3l-.5.2m2.3.4h-2c-.2 0-.3-.2-.3-.3l.5-.2h1.6l.2.5m0-2.8v-1.4l.2-.5c.2 0 .3.2.3.3v1.9l-.1.1-.4-.4m.4.5l.1.1v1.9c0 .2-.2.3-.3.3l-.2-.5v-1.4l.4-.4"/><path d="m33.5 9.3v-1.4l.2-.5c.2 0 .3.2.3.3v1.9l-.1.1-.4-.4m.4.4l.1.2v1.9c0 .2-.2.3-.3.3l-.2-.5v-1.4l.4-.5"/><path d="m34.8 9.7l-.1-.1v-1.6l.3-.3.2.2v1.4l-.4.4m.4.5v1.4l-.2.2-.3-.3v-1.6l.1-.1.4.4m1.6-2.3h-1.5l-.3-.3.3-.3h1.5l.2.3-.2.3m.2 4l-.3.3h-1.5l-.3-.3.3-.3h1.5l.3.3m-.1-2.6v-1.4l.2-.2.3.3v1.5l-.1.1-.4-.3m.4.5l.1.1v1.5l-.3.3-.2-.2v-1.4l.4-.3"/><path d="m38.2 9.7l-.1-.1v-1.9c0-.2.2-.3.3-.3l.2.5v1.4l-.4.4m.4.5v1.4l-.2.5c-.2 0-.3-.2-.3-.3v-1.9l.1-.1.4.4m1.6-.9h-.5l-1-1v-.4h.4l1.1 1.1v.3m.2 0v-1.4l.2-.5c.2 0 .3.2.3.3v1.9l-.1.1-.4-.4m.4.5l.1.1v1.9c0 .2-.2.3-.3.3l-.2-.5v-1.4l.4-.4"/><path d="m42.1 8v1.3l-.4.4-.1-.1v-1.8l.5.2m-.5 3.7v-1.8l.1-.1.4.4v1.3l-.5.2m2.5.4h-2.2c-.2 0-.3-.2-.3-.3l.5-.2h1.8l.2.5m-.2-4.2h-1.8l-.5-.2c0-.2.2-.3.3-.3h2.2l-.2.5m-.1 1.6l.3.3-.3.2h-1.7l-.3-.3.3-.3h1.7z"/></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(11,2)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.895,-2 -2,-2 l -2,0 c -1.104,0 -2,0.895 -2,2 l 0,7 c 0,1.105 0.896,2 2,2 l 2,0 C -0.895,9 0,8.105 0,7 L 0,0 Z"/></g><g transform="translate(31,2)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.895,-2 -2,-2 l -2,0 c -1.104,0 -2,0.895 -2,2 l 0,7 c 0,1.105 0.896,2 2,2 l 2,0 C -0.895,9 0,8.105 0,7 L 0,0 Z"/></g><g transform="translate(3,19)" id="g28"><path id="path30" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.448,-1 -1,-1 l -1,0 c -0.552,0 -1,0.447 -1,1 l 0,7 c 0,0.552 0.448,1 1,1 l 1,0 C -0.448,8 0,7.552 0,7 L 0,0 Z"/></g><g transform="translate(36,19)" id="g32"><path id="path34" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -1,0 c -0.553,0 -1,0.447 -1,1 l 0,7 c 0,0.552 0.447,1 1,1 l 1,0 C -0.447,8 0,7.552 0,7 L 0,0 Z"/></g><g transform="translate(35,25)" id="g36"><path id="path38" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 l -32,0 c -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 L -1,1 C -0.447,1 0,0.552 0,0"/></g><g transform="translate(35,21)" id="g40"><path id="path42" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -32,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L -1,1 C -0.447,1 0,0.553 0,0"/></g><g transform="translate(24,34)" id="g44"><path id="path46" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -8,0 c -1.104,0 -2,0.896 -2,2 0,1.104 0.896,2 2,2 l 8,0 C -0.895,2 0,1.104 0,0"/></g><g transform="translate(28,34)" id="g48"><path id="path50" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -20,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-20 0,-2 0,-4 4,0 20,0 4,0 0,4 0,2 0,20 C 4,-1.791 2.209,0 0,0"/></g><path id="path52" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 32,4 4,4 4,20 32,20 32,4 Z"/><g transform="translate(33,4)" id="g54"><path id="path56" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -28,0 c -0.552,0 -1,0.447 -1,1 l 0,1 c 0,0.553 0.448,1 1,1 L -1,2 C -0.447,2 0,1.553 0,1 L 0,0 Z"/></g><g transform="translate(32,19)" id="g58"><path id="path60" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.343,-3 -3,-3 l -22,0 c -1.657,0 -3,1.343 -3,3 l 0,7 c 0,1.657 1.343,3 3,3 l 22,0 C -1.343,10 0,8.657 0,7 L 0,0 Z"/></g><g transform="translate(30,19.9995)" id="g62"><path id="path64" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-1.999 -2,-1.999 l -20,0 c -1.104,0 -2,0.895 -2,1.999 l 0,5.001 c 0,1.104 0.896,2 2,2 l 20,0 c 1.105,0 2,-0.896 2,-2 L 0,0 Z"/></g><path id="path66" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 32,6 4,6 4,11 32,11 32,6 Z"/><path id="path68" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 12,8 -6,0 0,3 6,0 0,-3 z"/><path id="path70" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 30,8 -6,0 0,3 6,0 0,-3 z"/><path id="path72" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 6,8 4,8 4,11 6,11 6,8 Z"/><path id="path74" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 32,8 -2,0 0,3 2,0 0,-3 z"/><path id="path76" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 22,8 -8,0 0,3 8,0 0,-3 z"/><g transform="translate(22,32.5)" id="g78"><path id="path80" 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 l -5,0 c -0.829,0 -1.5,0.671 -1.5,1.5 0,0.829 0.671,1.5 1.5,1.5 l 5,0 C -0.672,1.5 0,0.829 0,0"/></g></g></g></g></svg>