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/1f9dc-1f3ff-200d-2640-fe0f.svg b/public/emoji/1f9dc-1f3ff-200d-2640-fe0f.svg
index abdd82796..2fc30a85c 100644
--- a/public/emoji/1f9dc-1f3ff-200d-2640-fe0f.svg
+++ b/public/emoji/1f9dc-1f3ff-200d-2640-fe0f.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(16.9995,36)" id="g20"><path id="path22" style="fill:#0b0200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.264,0 -2.435,-0.393 -3.402,-1.061 -3.598,-1.031 -3.795,-1 -3.999,-1 c -2.209,0 -4,-1.791 -4,-4 l 0,-6 c 0,-3.866 3.133,-7 7,-7 3.866,0 7,3.134 7,7 l 0,4.999 C 6.001,-2.686 3.314,0 0,0"/></g><g transform="translate(29.6374,17.3642)" id="g24"><path id="path26" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.305,0.612 -1.02,0.844 -1.589,0.515 L -4.69,-1.274 -6.8,2.955 c -0.346,0.929 -1.188,1.587 -2.176,1.587 l -2.346,0 -4.694,0 -2.45,0 c -1.015,0 -1.454,-0.595 -1.656,-0.937 L -26.393,-7.02 c -0.347,-0.589 -0.184,-1.368 0.363,-1.741 0.174,-0.12 0.367,-0.182 0.559,-0.194 0.412,-0.026 0.824,0.183 1.06,0.585 l 5.539,9.401 0.51,-0.275 1.173,-5.048 -1.173,-5.047 9.386,0 -1.173,5.047 1.173,5.048 0.481,0.259 2.292,-4.595 c 0.305,-0.611 1.02,-0.843 1.588,-0.515 l 4.136,2.386 C 0.089,-1.381 0.305,-0.612 0,0"/></g><g transform="translate(15.9685,18.1206)" id="g28"><path id="path30" style="fill:#e75a70;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -1.173,1.262 -2.347,1.262 -3.52,1.262 -4.693,0 -4.693,0 l 0.88,-3.786 7.626,0 L 4.693,0 C 4.693,0 3.52,1.262 2.347,1.262 1.173,1.262 0,0 0,0"/></g><g transform="translate(14,26)" id="g32"><path id="path34" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-4 c 0,-1.104 0.896,-2 2,-2 1.105,0 2,0.896 2,2 L 4,0 0,0 Z"/></g><g transform="translate(18,26)" id="g36"><path id="path38" style="fill:#664131;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4,-0.019 -4,-4 c 0,0 2,-1 4,0 l 0,4 z"/></g><g transform="translate(21,32.95)" id="g40"><path id="path42" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -10,0 0,-5.973 0,0 c 0,-2.75 2.238,-4.977 4.999,-4.977 2.762,0 5.001,2.227 5.001,4.977 l 0,0 L 0,0 Z"/></g><g transform="translate(14,33)" id="g44"><path id="path46" style="fill:#0b0200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0,-4 8,-4 L 8,0 0,0 Z"/></g><g transform="translate(14,33)" id="g48"><path id="path50" style="fill:#0b0200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0,-4 -4,-4 l 0,4 4,0 z"/></g><g transform="translate(18,24)" id="g52"><path id="path54" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 -2,0 c 0,0 0,-1 2,-1 2,0 2,1 2,1"/></g><g transform="translate(14,27.5)" id="g56"><path id="path58" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 -1,0.276 -0.776,0.5 -0.5,0.5 -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(19,27.5)" id="g60"><path id="path62" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 -1,0.276 -0.776,0.5 -0.5,0.5 -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(15,26)" id="g64"><path id="path66" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1,0 2,0 C 2,0 1.999,-1 1,-1 0,-1 0,0 0,0"/></g><g transform="translate(29.0136,7.1616)" id="g68"><path id="path70" style="fill:#5d9040;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.254,1.98 1.374,5.968 1.374,5.968 0.623,5.308 -0.036,3.305 -2.29,1.326 -3.093,0.62 -3.49,-0.304 -3.596,-1.128 -4.437,-1.358 -5.74,-1.657 -7.014,-1.715 -7.72,-1.748 -8.45,-1.67 -9.185,-1.52 c 0.707,0.55 1.171,1.399 1.171,2.358 l 0,1 c 0,1.1 -0.9,2 -2,2 l -9,0 c -1.201,0 -2.236,-0.719 -2.714,-1.745 -10e-4,0 -0.008,-0.003 -0.008,-0.003 -0.004,-0.01 -0.006,-0.021 -0.01,-0.031 -0.043,-0.095 -0.073,-0.195 -0.106,-0.296 -0.025,-0.076 -0.05,-0.152 -0.072,-0.23 -0.011,-0.049 -0.025,-0.097 -0.034,-0.148 -0.569,-2.401 0.736,-5.48 3.944,-6.547 1.98,-0.658 6.075,-1.291 9.662,-0.658 2.511,0.443 4.61,1.555 5.924,2.403 0.636,-0.247 1.5,-0.23 2.735,0.213 C 2.579,-2.388 2.663,0.12 6.382,1.701 3.832,2.537 0,0 0,0"/></g><g transform="translate(19.4473,5.7314)" id="g72"><path id="path74" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.023,0 -0.049,0.002 -0.073,0.007 -2.313,0.453 -6.86,2.554 -7.052,2.644 -7.24,2.73 -7.322,2.953 -7.235,3.141 -7.148,3.33 -6.923,3.412 -6.737,3.323 -6.69,3.302 -2.08,1.171 0.073,0.743 0.276,0.702 0.408,0.505 0.368,0.302 0.332,0.123 0.176,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#0B0200" d="M17 0c-1.264 0-2.435.393-3.402 1.061C13.401 1.031 13.205 1 13 1c-2.209 0-4 1.791-4 4v6c0 3.866 3.134 7 7 7s7-3.134 7-7V6.001C23 2.687 20.313 0 17 0z"/><path fill="#7C533E" d="M29.637 18.636c-.305-.612-1.02-.844-1.589-.515l-3.102 1.79-2.11-4.23c-.346-.929-1.188-1.587-2.175-1.587h-9.49c-1.016 0-1.454.595-1.656.938L3.244 25.656c-.347.588-.184 1.368.363 1.741.174.12.367.182.559.194.412.026.824-.183 1.06-.585l5.539-9.401.51.274 1.173 5.048-1.173 5.048h9.387l-1.173-5.048 1.173-5.048.48-.258 2.292 4.594c.305.612 1.02.844 1.589.515l4.136-2.387c.568-.327.784-1.096.478-1.707z"/><path fill="#E75A70" d="M15.968 17.879s-1.173-1.262-2.347-1.262-2.347 1.262-2.347 1.262l.88 3.786h7.627l.88-3.786s-1.173-1.262-2.347-1.262c-1.172 0-2.346 1.262-2.346 1.262z"/><path fill="#7C533E" d="M14 10v4c0 1.104.896 2 2 2s2-.896 2-2v-4h-4z"/><path fill="#664131" d="M18 10l-4 .019V14s2 1 4 0v-4z"/><path fill="#7C533E" d="M21 3.05H11v5.973C11 11.773 13.238 14 16 14s5-2.227 5-4.977V3.05z"/><path fill="#0B0200" d="M14 3s0 4 8 4V3h-8zm0 0s0 4-4 4V3h4z"/><path fill="#DF1F32" d="M18 12h-4s0 1 2 1 2-1 2-1z"/><circle cx="13.5" cy="8.5" r=".5"/><circle cx="18.5" cy="8.5" r=".5"/><path fill="#3D2E24" d="M15 10h2s0 1-1 1-1-1-1-1z"/><path fill="#5D9040" d="M29.014 28.838c2.254-1.98 1.374-5.968 1.374-5.968-.751.66-1.41 2.663-3.664 4.642-.803.705-1.2 1.629-1.306 2.454-.842.23-2.145.529-3.418.587-.706.032-1.436-.046-2.172-.195C20.535 29.809 21 28.96 21 28v-1c0-1.1-.9-2-2-2h-9c-1.201 0-2.236.719-2.714 1.745l-.008.003-.011.031c-.043.095-.072.196-.105.296-.025.076-.051.152-.072.23-.012.049-.025.098-.034.148-.57 2.401.735 5.48 3.944 6.547 1.979.658 6.075 1.291 9.662.658 2.511-.443 4.61-1.555 5.924-2.402.635.247 1.499.23 2.735-.214 2.272-.816 2.356-3.324 6.075-4.905-2.55-.836-6.382 1.701-6.382 1.701z"/><path fill="#292F33" d="M19.447 30.269c-.023 0-.049-.002-.073-.007-2.24-.446-6.787-2.547-6.979-2.637-.188-.087-.27-.31-.183-.497.087-.189.312-.271.498-.183.046.021 4.657 2.152 6.81 2.58.203.041.335.238.295.441-.036.18-.192.303-.368.303z"/></svg>
\ No newline at end of file