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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f47c-1f3ff.svg b/public/emoji/1f47c-1f3ff.svg
index 5e7bb9f04..1be099a01 100644
--- a/public/emoji/1f47c-1f3ff.svg
+++ b/public/emoji/1f47c-1f3ff.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="#bec6c9"><path d="m5.4 11.1c1.4-1.1 6.2 3.5 10.7 10.2 4.5 6.8 7 13.2 5.5 14.3-1.4 1.1-6.2-3.5-10.7-10.2-4.5-6.8-7-13.2-5.5-14.3"/><path d="m2.2 19.4c1-1.5 6.7 1.1 12.7 5.8 6 4.8 10 9.9 8.9 11.4-1 1.5-6.7-1.1-12.7-5.8-6-4.8-10-9.9-8.9-11.4"/><path d="m3.9 29.4c.4-1.9 5.3-2.2 10.9-.7 5.6 1.5 9.8 4.1 9.4 6-.4 1.9-5.3 2.2-10.9.7-5.6-1.5-9.8-4.1-9.4-6"/><path d="m4 39.1c-.7-1.8 2.7-5 7.5-7.3 4.8-2.3 9.3-2.7 10-.9.7 1.8-2.7 5-7.5 7.3-4.8 2.2-9.3 2.7-10 .9"/><path d="m6.4 45.8c-.9-1.5 1.8-5.3 6.2-8.5 4.3-3.2 8.6-4.7 9.5-3.2.9 1.5-1.8 5.3-6.2 8.5-4.3 3.2-8.6 4.6-9.5 3.2"/><path d="m10.8 51.7c-1.2-1.2.8-5.6 4.4-9.7 3.6-4.1 7.6-6.5 8.8-5.2 1.2 1.2-.8 5.6-4.4 9.7-3.7 4.1-7.6 6.5-8.8 5.2"/><path d="m10.2 6.1c1.1-.6 3.9 3.1 6.2 8.2 2.3 5.1 3.3 9.8 2.2 10.4-1.1.6-3.9-3.1-6.2-8.2-2.3-5.2-3.3-9.8-2.2-10.4"/><path d="m14.9 56.8c-1.1-.7.3-5.3 3-10.1 2.8-4.9 5.9-8.2 7-7.5 1.1.7-.3 5.2-3 10.1-2.8 4.9-5.9 8.2-7 7.5"/><path d="m20.2 58.6c-.9-.2-.9-4.9.1-10.5.9-5.6 2.4-10 3.3-9.8.9.2.9 4.9-.1 10.5-.9 5.5-2.4 9.9-3.3 9.8"/><path d="m24.9 60c-.9-.1-1.1-4-.5-8.6.6-4.6 1.8-8.3 2.7-8.1.9.1 1.1 4 .5 8.6-.6 4.6-1.8 8.2-2.7 8.1"/></g><g fill="#e1edf5"><path d="m13 7.6c1.4-1.1 6.2 3.5 10.7 10.2 4.5 6.8 7 13.2 5.5 14.3-1.4 1.1-6.2-3.5-10.7-10.2-4.4-6.8-6.9-13.2-5.5-14.3"/><path d="M6,15.8c1-1.5,6.7,1.1,12.7,5.8c6,4.8,10,9.9,8.9,11.4c-1,1.5-6.7-1.1-12.7-5.8C9,22.5,5,17.4,6,15.8z"/><path d="m4.9 27.3c.4-1.9 5.3-2.2 10.9-.7 5.6 1.5 9.8 4.1 9.4 6-.4 1.9-5.3 2.2-10.9.7-5.6-1.4-9.8-4.1-9.4-6"/><path d="m7 39.6c-.9-1.7 2.2-5.3 6.8-8 4.6-2.8 9-3.6 9.9-2 .9 1.7-2.2 5.3-6.8 8-4.6 2.8-9.1 3.7-9.9 2"/><path d="m9.8 46c-1-1.2 1.3-5.3 5.3-9.1 3.9-3.8 7.9-5.9 9-4.6 1 1.2-1.3 5.3-5.3 9.1-4 3.8-8 5.9-9 4.6"/><path d="m12.3 54.5c-1.1-.6-.1-5.2 2.3-10.3 2.4-5.1 5.2-8.7 6.3-8.1 1.1.6.1 5.2-2.3 10.3-2.4 5.1-5.2 8.7-6.3 8.1"/><path d="m18.3 56.4c-1.2-.4-1.1-5.1.3-10.6 1.4-5.5 3.5-9.7 4.7-9.3 1.2.4 1.1 5.1-.3 10.6-1.4 5.5-3.5 9.6-4.7 9.3"/><path d="m22.8 57.9c-.9-.3-.5-4.9.9-10.4 1.4-5.5 3.2-9.8 4.1-9.5.9.3.5 4.9-.9 10.4-1.4 5.5-3.2 9.7-4.1 9.5"/></g><g fill="#bec6c9"><path d="m58.4 11.3c-1.4-1.1-6.2 3.5-10.7 10.2-4.5 6.8-7 13.2-5.5 14.3 1.4 1.1 6.2-3.5 10.7-10.2 4.4-6.7 6.9-13.1 5.5-14.3"/><path d="m61.8 19.4c-1-1.5-6.7 1.1-12.7 5.8-6 4.8-10 9.9-8.9 11.4 1 1.5 6.7-1.1 12.7-5.8 6-4.8 10-9.9 8.9-11.4"/><path d="m60.6 29.4c-.4-1.9-5.3-2.2-10.9-.7-5.6 1.5-9.8 4.1-9.4 6 .4 1.9 5.3 2.2 10.9.7 5.6-1.5 9.8-4.1 9.4-6"/><path d="m60 39.1c.7-1.8-2.7-5-7.5-7.3-4.8-2.3-9.3-2.7-10-.9-.7 1.8 2.7 5 7.5 7.3 4.8 2.2 9.3 2.7 10 .9"/><path d="m57.6 45.8c.9-1.5-1.8-5.3-6.2-8.5-4.3-3.2-8.6-4.7-9.5-3.2-.9 1.5 1.8 5.3 6.2 8.5 4.3 3.2 8.6 4.6 9.5 3.2"/><path d="m53.2 51.7c1.2-1.2-.8-5.6-4.4-9.7-3.6-4.1-7.6-6.5-8.8-5.2-1.2 1.2.8 5.6 4.4 9.7 3.7 4.1 7.6 6.5 8.8 5.2"/><path d="m53.8 6.1c-1.1-.6-3.9 3.1-6.2 8.2-2.3 5.1-3.3 9.8-2.2 10.4 1.1.6 3.9-3.1 6.2-8.2 2.3-5.2 3.3-9.8 2.2-10.4"/><path d="m49.1 56.8c1.1-.7-.3-5.3-3-10.1-2.8-4.9-5.9-8.2-7-7.5-1.1.7.3 5.2 3 10.1 2.8 4.9 5.9 8.2 7 7.5"/><path d="m43.8 58.6c.9-.2.9-4.9-.1-10.5-.9-5.6-2.4-10-3.3-9.8-.9.2-.8 4.9.1 10.5.9 5.5 2.4 9.9 3.3 9.8"/><path d="m39.1 60c.9-.1 1.1-4 .5-8.6-.6-4.6-1.8-8.3-2.7-8.1-.9.1-1.1 4-.5 8.6.6 4.6 1.8 8.2 2.7 8.1"/></g><g fill="#e1edf5"><path d="m51.6 7.6c-1.4-1.1-6.2 3.5-10.7 10.2-4.5 6.8-7 13.2-5.5 14.3 1.4 1.1 6.2-3.5 10.7-10.2 4.4-6.8 6.9-13.2 5.5-14.3"/><path d="m58 15.8c-1-1.5-6.7 1.1-12.7 5.8-6 4.8-10 9.9-8.9 11.4 1 1.5 6.7-1.1 12.7-5.8 5.9-4.7 9.9-9.8 8.9-11.4"/><path d="m59.1 27.3c-.4-1.9-5.3-2.2-10.9-.7-5.6 1.5-9.8 4.1-9.4 6 .4 1.9 5.3 2.2 10.9.7 5.6-1.4 9.8-4.1 9.4-6"/><path d="m57 39.6c.8-1.7-2.2-5.3-6.8-8-4.6-2.8-9-3.6-9.9-2-.9 1.7 2.2 5.3 6.8 8 4.6 2.8 9.1 3.7 9.9 2"/><path d="m54.2 46c1-1.2-1.3-5.3-5.3-9.1-3.9-3.8-7.9-5.9-8.9-4.6-1 1.2 1.3 5.3 5.3 9.1 3.9 3.8 7.9 5.9 8.9 4.6"/><path d="m51.7 54.5c1.1-.6.1-5.2-2.3-10.3-2.4-5.1-5.2-8.7-6.3-8.1-1.1.6-.1 5.2 2.3 10.3 2.4 5.1 5.2 8.7 6.3 8.1"/><path d="m45.7 56.4c1.2-.4 1.1-5.1-.3-10.6-1.4-5.5-3.5-9.7-4.7-9.3-1.2.4-1.1 5.1.3 10.6 1.4 5.5 3.5 9.6 4.7 9.3"/><path d="m41.2 57.9c.9-.3.5-4.9-.9-10.4-1.4-5.5-3.2-9.8-4.1-9.5-.9.3-.5 4.9.9 10.4 1.4 5.5 3.2 9.7 4.1 9.5"/></g><path d="m32 13.5c15.3 0 18.7 10.2 18.7 16 0 5.1-.7 7.3-.7 7.3h-36c0 0-.7-2.2-.7-7.3 0-5.8 3.4-16 18.7-16" fill="#231f20"/><path d="m48.8 34.2c0 0-.5-2.2-.8-6.8-.3-5-7.3-1-16-1-8.7 0-15.7-4-16 1-.3 4.6-.8 6.8-.8 6.8-4.3 0-4.3 7 .3 7 0 7.6 9.5 12.3 16.5 12.3 7 0 16.5-4.7 16.5-12.3 4.6 0 4.6-7 .3-7" fill="#8a6859"/><circle cx="40.3" cy="35.8" r="4.3" fill="#fff"/><circle cx="40.3" cy="35.8" r="3" fill="#664e27"/><circle cx="40.3" cy="35.8" r="1" fill="#231f20"/><circle cx="23.7" cy="35.8" r="4.3" fill="#fff"/><circle cx="23.7" cy="35.8" r="3" fill="#664e27"/><circle cx="23.7" cy="35.8" r="1" fill="#231f20"/><path d="m38 45.6c0 2.3-3 3.4-6 3.4-3 0-6-1.1-6-3.4 0 0 0-.6.6-.6 2.7 0 8.1 0 10.8 0 .6 0 .6.6.6.6" fill="#574137"/><path d="m32 8.1c-8.3 0-14.9 1.4-14.9 4.4s6.7 5.3 14.9 5.3c8.3 0 14.9-2.4 14.9-5.3s-6.7-4.4-14.9-4.4m0 5.2c-5.5 0-10-.8-10-1.8 0-1 4.5-1.7 10-1.7 5.5 0 10 .7 10 1.7 0 1-4.5 1.8-10 1.8" fill="#4aa9ff"/></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(0.0054,5.9072)" id="g20"><path id="path22" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.003,-0.015 -0.004,-0.027 -0.005,-0.041 0.001,-0.11 0.02,-0.215 0.031,-0.322 0.009,-0.074 0.011,-0.151 0.021,-0.225 0.015,-0.069 0.032,-0.137 0.046,-0.2 0.617,-2.893 4.333,-5.119 8.842,-5.119 4.505,0 8.224,2.226 8.838,5.119 0.018,0.066 0.035,0.131 0.046,0.199 0.012,0.074 0.015,0.152 0.022,0.227 0.012,0.106 0.031,0.211 0.033,0.321 0,0.015 -0.005,0.028 -0.006,0.041 0.001,0.018 0.004,0.035 0.006,0.053 l -0.009,0 c -0.051,1.652 -1.358,2.979 -2.971,2.979 -1.617,0 -2.923,-1.327 -2.973,-2.979 l -0.017,0 c 10e-4,0.031 0.009,0.06 0.009,0.093 0,1.696 -1.334,3.072 -2.98,3.072 C 7.289,3.218 5.955,1.844 5.954,0.146 5.955,0.113 5.962,0.083 5.965,0.053 l -0.019,0 C 5.896,1.705 4.59,3.032 2.974,3.032 1.359,3.032 0.053,1.705 0.004,0.053 L -0.005,0.054 C -0.005,0.035 0,0.018 0,0"/></g><g transform="translate(18.0889,5.9072)" id="g24"><path id="path26" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.004,-0.015 -0.005,-0.027 -0.006,-0.041 0.001,-0.11 0.02,-0.215 0.031,-0.322 0.01,-0.074 0.011,-0.151 0.022,-0.225 0.014,-0.069 0.031,-0.137 0.046,-0.2 0.616,-2.893 4.333,-5.119 8.841,-5.119 4.505,0 8.224,2.226 8.838,5.119 0.018,0.066 0.036,0.131 0.046,0.199 0.012,0.074 0.016,0.152 0.023,0.227 0.012,0.106 0.03,0.211 0.032,0.321 0,0.015 -0.004,0.028 -0.006,0.041 0.002,0.018 0.004,0.035 0.006,0.053 l -0.009,0 c -0.051,1.652 -1.357,2.979 -2.97,2.979 -1.617,0 -2.923,-1.327 -2.973,-2.979 l -0.018,0 c 10e-4,0.031 0.009,0.06 0.009,0.093 0,1.696 -1.334,3.072 -2.979,3.072 C 7.289,3.218 5.955,1.844 5.953,0.146 5.955,0.113 5.962,0.083 5.965,0.053 l -0.02,0 C 5.895,1.705 4.59,3.032 2.974,3.032 1.358,3.032 0.053,1.705 0.004,0.053 l -0.01,0.001 C -0.006,0.035 0,0.018 0,0"/></g><g transform="translate(30,15)" id="g28"><path id="path30" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-6.627 -5.373,-12 -12,-12 -6.627,0 -12,5.373 -12,12 0,6.627 5.373,12 12,12 C -5.373,12 0,6.627 0,0"/></g><g transform="translate(18,30.7949)" id="g32"><path id="path34" style="fill:#0b0200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -7.444,0 -13.5,-6.056 -13.5,-13.5 0,-1.9 0.396,-3.751 1.178,-5.499 0.092,-0.202 0.301,-0.317 0.526,-0.291 0.221,0.031 0.394,0.204 0.426,0.425 0.393,2.755 2.581,4.706 4.512,6.428 1.793,1.599 3.497,3.119 3.444,5.041 6.516,-1.171 14.006,-6.017 14.784,-11.469 0.031,-0.221 0.205,-0.394 0.426,-0.425 0.023,-0.003 0.047,-0.005 0.069,-0.005 0.196,0 0.375,0.114 0.456,0.296 0.783,1.748 1.179,3.599 1.179,5.499 C 13.5,-6.056 7.444,0 0,0"/></g><g transform="translate(14,9)" id="g36"><path id="path38" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 8,0 C 8,0 7,-2 4,-2 1,-2 0,0 0,0"/></g><g transform="translate(16,14)" id="g40"><path id="path42" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.448,-1 -1,-1 -0.552,0 -1,0.447 -1,1 l 0,2 c 0,0.553 0.448,1 1,1 0.552,0 1,-0.447 1,-1 L 0,0 Z"/></g><g transform="translate(22,14)" id="g44"><path id="path46" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 -0.553,0 -1,0.447 -1,1 l 0,2 c 0,0.553 0.447,1 1,1 0.553,0 1,-0.447 1,-1 L 0,0 Z"/></g><g transform="translate(18,27)" id="g48"><path id="path50" style="fill:#8ccaf7;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -4.971,0 -9,1.567 -9,3.5 -9,5.433 -4.971,7 0,7 4.971,7 9,5.433 9,3.5 9,1.567 4.971,0 0,0 m 0,9 c -6.627,0 -12,-2.686 -12,-6 0,-3.313 5.373,-6 12,-6 6.627,0 12,2.687 12,6 0,3.314 -5.373,6 -12,6"/></g></g></g></g></svg>