Merge pull request #557 from ThibG/glitch-soc/tentative-merge

Merge upstream changes

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f63e.svg b/public/emoji/1f63e.svg
index edb262e0f..f93d26cbf 100644
--- a/public/emoji/1f63e.svg
+++ b/public/emoji/1f63e.svg
@@ -1 +1 @@
-<?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(36,16)" id="g20"><path id="path22" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-10 -11,-16 -18,-16 -7,0 -18,6.059 -18,16 0,9.941 4,20 18,20 C -4,20 0,10 0,0"/></g><g transform="translate(35,35)" id="g24"><path id="path26" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1,-1 0,-11 0,-11 l -8,10 c 0,0 7,2 8,1"/></g><g transform="translate(1,35)" id="g28"><path id="path30" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1,-1 0,-11 0,-11 L 8,-1 C 8,-1 1,1 0,0"/></g><g transform="translate(14,21.5)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.933 -0.895,-3.5 -2,-3.5 -1.104,0 -2,1.567 -2,3.5 0,1.933 0.896,3.5 2,3.5 1.105,0 2,-1.567 2,-3.5"/></g><g transform="translate(26,21.5)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.933 -0.895,-3.5 -2,-3.5 -1.104,0 -2,1.567 -2,3.5 0,1.933 0.896,3.5 2,3.5 1.105,0 2,-1.567 2,-3.5"/></g><g transform="translate(17.9995,16.5)" id="g40"><path id="path42" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 3.001,0 3.001,-0.5 3.001,-1.5 0,-1 -1.5,-3 -3.001,-3 -1.5,0 -3,2 -3,3 0,1 -10e-4,1.5 3,1.5"/></g><g transform="translate(26,15.5)" id="g44"><path id="path46" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.209,0 -0.404,0.133 -0.475,0.342 -0.086,0.262 0.055,0.545 0.317,0.633 l 9,2.999 C 9.105,4.062 9.387,3.92 9.475,3.658 9.562,3.396 9.42,3.113 9.158,3.026 l -9,-3.001 C 0.105,0.008 0.053,0 0,0"/></g><g transform="translate(24.999,13.5)" id="g48"><path id="path50" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.233,0 -0.441,0.164 -0.489,0.402 -0.055,0.271 0.121,0.534 0.392,0.588 l 10,2 C 10.163,3.044 10.436,2.87 10.491,2.598 10.546,2.327 10.37,2.064 10.099,2.01 l -10,-2 C 0.066,0.003 0.033,0 0,0"/></g><g transform="translate(10,15.5)" id="g52"><path id="path54" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.052,0 -0.105,0.008 -0.158,0.025 l -9,3.001 c -0.262,0.087 -0.404,0.37 -0.316,0.632 0.087,0.262 0.368,0.404 0.632,0.316 l 9,-2.999 C 0.42,0.887 0.561,0.604 0.474,0.342 0.404,0.133 0.21,0 0,0"/></g><g transform="translate(11.0005,13.5)" id="g56"><path id="path58" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.032,0 -0.065,0.003 -0.099,0.01 l -10,2 c -0.27,0.054 -0.446,0.317 -0.392,0.588 0.054,0.271 0.313,0.449 0.589,0.392 l 10,-2 C 0.368,0.936 0.544,0.673 0.49,0.402 0.442,0.164 0.233,0 0,0"/></g><g transform="translate(30.708,25.3532)" id="g60"><path id="path62" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.215,-0.215 -0.525,-0.33 -0.849,-0.283 -4.357,0.622 -6.831,-1.742 -6.934,-1.843 -0.393,-0.385 -1.025,-0.381 -1.412,0.01 -0.387,0.391 -0.387,1.019 0.002,1.408 0.13,0.13 3.243,3.173 8.626,2.404 C -0.019,1.619 0.36,1.112 0.282,0.565 0.25,0.342 0.148,0.148 0,0"/></g><g transform="translate(5.292,25.3532)" id="g64"><path id="path66" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.215,-0.215 0.525,-0.33 0.849,-0.283 4.357,0.622 6.831,-1.742 6.934,-1.843 0.393,-0.385 1.025,-0.381 1.412,0.01 0.387,0.391 0.387,1.019 -0.002,1.408 C 9.063,-0.578 5.95,2.465 0.567,1.696 0.019,1.619 -0.36,1.112 -0.282,0.565 -0.25,0.342 -0.148,0.148 0,0"/></g><g transform="translate(25.4849,6.1211)" id="g68"><path id="path70" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.045,0.179 -1.168,4.379 -7.485,4.379 -6.318,0 -7.441,-4.2 -7.485,-4.379 -0.055,-0.217 0.043,-0.442 0.237,-0.554 0.195,-0.109 0.439,-0.079 0.599,0.077 0.019,0.019 1.954,1.856 6.649,1.856 4.694,0 6.63,-1.837 6.648,-1.856 0.096,-0.094 0.224,-0.144 0.352,-0.144 0.084,0 0.169,0.021 0.246,0.064 C -0.043,-0.445 0.055,-0.218 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCC4D" d="M36 20c0 10-11 16-18 16S0 29.941 0 20C0 10.059 4 0 18 0s18 10 18 20z"/><path fill="#FFCC4D" d="M35 1c1 1 0 11 0 11L27 2s7-2 8-1zM1 1C0 2 1 12 1 12L9 2S2 0 1 1z"/><ellipse fill="#292F33" cx="12" cy="14.5" rx="2" ry="3.5"/><ellipse fill="#292F33" cx="24" cy="14.5" rx="2" ry="3.5"/><path fill="#67757F" d="M18 19.5c3 0 3 .5 3 1.5s-1.5 3-3 3-3-2-3-3-.001-1.5 3-1.5z"/><path d="M26 20.5c-.209 0-.404-.133-.475-.342-.087-.262.055-.545.316-.633l9-3c.264-.087.545.054.633.316.087.262-.055.545-.316.632l-9 3c-.053.019-.105.027-.158.027zm-1.001 2c-.233 0-.441-.164-.489-.402-.055-.271.121-.534.392-.588l10-2c.26-.054.533.12.588.392.055.271-.121.534-.393.588l-10 2c-.032.007-.065.01-.098.01zM10 20.5c-.052 0-.106-.008-.158-.025l-9-3c-.262-.087-.403-.37-.316-.632.087-.262.368-.404.632-.316l9 3c.262.088.403.371.316.633-.07.207-.264.34-.474.34zm1 2c-.032 0-.065-.003-.099-.01l-10-2c-.271-.054-.446-.317-.392-.588.054-.271.313-.449.588-.392l10 2c.271.054.446.317.392.588-.046.238-.255.402-.489.402z" fill="#9AAAB4"/><path fill="#292F33" d="M30.708 10.647c-.215.215-.525.33-.849.283-4.357-.623-6.831 1.742-6.934 1.843-.393.385-1.025.381-1.412-.01s-.387-1.02.002-1.408c.13-.13 3.243-3.173 8.626-2.404.547.078.927.584.848 1.131-.031.223-.133.417-.281.565zm-25.416 0c.215.215.525.33.849.283 4.357-.623 6.831 1.742 6.934 1.843.393.385 1.025.381 1.412-.01s.387-1.02-.002-1.408c-.13-.13-3.243-3.173-8.626-2.404-.548.077-.927.584-.849 1.131.032.223.134.417.282.565zm20.193 19.232c-.045-.179-1.168-4.379-7.486-4.379s-7.44 4.2-7.485 4.379c-.055.217.043.442.237.554.195.109.439.079.6-.077.019-.019 1.954-1.855 6.648-1.855s6.63 1.837 6.648 1.855c.096.095.224.145.352.145.084 0 .169-.021.246-.064.197-.113.294-.34.24-.558z"/></svg>
\ No newline at end of file