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/1f482-1f3fd-200d-2642-fe0f.svg b/public/emoji/1f482-1f3fd-200d-2642-fe0f.svg
index 48eef9556..268da5487 100644
--- a/public/emoji/1f482-1f3fd-200d-2642-fe0f.svg
+++ b/public/emoji/1f482-1f3fd-200d-2642-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,0 36,0 36,36 0,36 0,0 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(27,18)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.971 -4.029,-5 -9,-5 -4.971,0 -9,0.029 -9,5 0,8.938 4.029,9 9,9 4.971,0 9,-0.101 9,-9"/></g><g transform="translate(30,0)" id="g24"><path id="path26" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,1 c 0,3.314 -1.686,6 -5,6 l -14,0 c -3.313,0 -5,-2.686 -5,-6 l 0,-1 24,0 z"/></g><g transform="translate(14.626,6.5439)" id="g28"><path id="path30" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.344,-0.976 2.195,-1.194 3.36,-1.194 1.165,0 2.017,0.218 3.361,1.194 l 0,2.937 L 0,2.937 0,0 Z"/></g><g transform="translate(14.6196,8.1846)" id="g32"><path id="path34" style="fill:#cc9b7a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.938,-1.06 2.1,-1.346 3.364,-1.346 1.264,0 2.426,0.287 3.363,1.346 l 0,2.69 L 0,2.69 0,0 Z"/></g><g transform="translate(12.9341,15.9199)" id="g36"><path id="path38" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.115 -0.565,-2.021 -1.263,-2.021 -0.698,0 -1.263,0.906 -1.263,2.021 0,1.116 0.565,2.021 1.263,2.021 C -0.565,2.021 0,1.116 0,0"/></g><g transform="translate(25.5654,15.9199)" id="g40"><path id="path42" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.115 -0.565,-2.021 -1.263,-2.021 -0.698,0 -1.263,0.906 -1.263,2.021 0,1.116 0.565,2.021 1.263,2.021 C -0.565,2.021 0,1.116 0,0"/></g><g transform="translate(11.418,15.1309)" id="g44"><path id="path46" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,4.308 2.941,7.8 6.568,7.8 3.628,0 6.569,-3.492 6.569,-7.8 0,-4.308 -2.941,-7.8 -6.569,-7.8 C 2.941,-7.8 0,-4.308 0,0"/></g><g transform="translate(17.9863,9.8574)" id="g48"><path id="path50" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.123,0 -2.774,0.544 -2.884,0.652 -0.197,0.199 -0.197,0.518 0,0.716 0.192,0.191 0.498,0.196 0.696,0.018 0.04,-0.03 0.556,-0.375 2.188,-0.375 1.695,0 2.187,0.373 2.191,0.377 C 2.388,1.584 2.697,1.574 2.895,1.378 3.092,1.18 3.081,0.851 2.884,0.652 2.775,0.544 2.123,0 0,0"/></g><g transform="translate(14.9038,15.0996)" id="g52"><path id="path54" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.424,0 -0.771,0.348 -0.771,0.771 l 0,0.77 c 0,0.424 0.347,0.772 0.771,0.772 0.424,0 0.771,-0.348 0.771,-0.772 l 0,-0.77 C 0.771,0.348 0.424,0 0,0"/></g><g transform="translate(21.0693,15.0996)" id="g56"><path id="path58" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.424,0 -0.771,0.348 -0.771,0.771 l 0,0.77 c 0,0.424 0.347,0.772 0.771,0.772 0.424,0 0.771,-0.348 0.771,-0.772 l 0,-0.77 C 0.771,0.348 0.424,0 0,0"/></g><g transform="translate(18.5645,12.9805)" id="g60"><path id="path62" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.156,0 c -0.318,0 -0.578,0.26 -0.578,0.578 0,0.318 0.26,0.578 0.578,0.578 l 1.156,0 c 0.318,0 0.578,-0.26 0.578,-0.578 C 0.578,0.26 0.318,0 0,0"/></g><g transform="translate(12.5781,5.5391)" id="g64"><path id="path66" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.653,-0.737 c -0.272,-0.043 -0.529,0.144 -0.572,0.416 l -0.157,0.987 c -0.043,0.272 0.144,0.529 0.416,0.572 l 4.653,0.738 C -0.041,2.019 0.216,1.831 0.259,1.561 L 0.416,0.572 C 0.459,0.3 0.272,0.043 0,0"/></g><g transform="translate(23.4482,5.5391)" id="g68"><path id="path70" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 4.652,-0.737 c 0.273,-0.043 0.53,0.144 0.573,0.416 L 5.382,0.666 C 5.425,0.938 5.237,1.195 4.966,1.238 L 0.312,1.976 C 0.041,2.019 -0.217,1.831 -0.26,1.561 L -0.416,0.572 C -0.459,0.3 -0.272,0.043 0,0"/></g><g transform="translate(11.875,18)" id="g72"><path id="path74" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.174,-9 6.113,-9 6.287,0 6.137,9 6.137,9 l 0.875,0 c 0,0 -0.307,-10 -7,-10 -6.693,0 -7,10 -7,10 L 0,0 Z"/></g><g transform="translate(26,18)" id="g76"><path id="path78" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -16,0 c -0.55,0 -1,0.45 -1,1 l 0,11 c 0,3.3 2.7,6 6,6 l 6,0 c 3.3,0 6,-2.7 6,-6 L 1,1 C 1,0.45 0.55,0 0,0"/></g><path id="path80" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 18.5,0 -1,0 0,5 1,0 0,-5 z"/><g transform="translate(14.6196,8.1846)" id="g82"><path id="path84" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.62,0.127 -0.62,-1.185 0,-1.31 1.888,-3 4,-3 l 0,2 C 2.236,-2.185 0,-1.576 0,0"/></g><g transform="translate(21.3799,8.1846)" id="g86"><path id="path88" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.62,0.127 0.62,-1.185 0,-1.31 -1.888,-3 -4,-3 l 0,2 C -2.235,-2.185 0,-1.576 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#DD2E44" d="M30 36v-1c0-3.313-1.687-6-5-6H11c-3.313 0-5 2.687-5 6v1h24z"/><path fill="#292F33" d="M27 6c0-3.3-2.7-6-6-6h-6c-3.3 0-6 2.7-6 6v12c0 4.971 4.029 5 9 5s9-.029 9-5V6z"/><path fill="#D5AB88" d="M14.626 29.456c1.344.976 2.195 1.194 3.36 1.194s2.016-.218 3.36-1.194v-2.938h-6.721v2.938z"/><path fill="#CC9B7A" d="M14.62 27.816c.938 1.059 2.1 1.345 3.364 1.345 1.264 0 2.426-.287 3.364-1.345v-2.691H14.62v2.691z"/><path fill="#D5AB88" d="M25.565 20.08c0-1.116-.565-2.021-1.263-2.021-.064 0-.125.015-.186.03-.009-.03-.016-.06-.026-.089H11.883c-.01.029-.016.059-.026.089-.061-.015-.123-.03-.186-.03-.698 0-1.263.905-1.263 2.021 0 1.025.479 1.863 1.097 1.994.489 3.734 3.201 6.595 6.482 6.595s5.993-2.861 6.482-6.595c.618-.132 1.096-.969 1.096-1.994z"/><path fill="#C1694F" d="M17.987 26.143c-2.123 0-2.774-.544-2.884-.653-.197-.197-.197-.517 0-.714.191-.191.497-.197.695-.018.04.029.556.376 2.188.376 1.695 0 2.186-.374 2.191-.377.197-.196.506-.187.704.01.197.197.187.527-.011.724-.109.108-.761.652-2.883.652zm.578-3.123h-1.156c-.318 0-.578-.26-.578-.578 0-.318.26-.578.578-.578h1.156c.318 0 .578.26.578.578 0 .318-.261.578-.578.578z"/><path fill="#662113" d="M14.904 20.9c-.424 0-.771-.347-.771-.771v-.771c0-.424.347-.771.771-.771.424 0 .771.347.771.771v.771c-.001.424-.348.771-.771.771zm6.165 0c-.424 0-.771-.347-.771-.771v-.771c0-.424.347-.771.771-.771.424 0 .771.347.771.771v.771c0 .424-.347.771-.771.771z"/><path fill="#292F33" d="M12.578 30.461l-4.653.737c-.272.043-.529-.144-.572-.416l-.156-.988c-.043-.272.144-.529.416-.572l4.653-.737c.272-.043.529.144.572.416l.156.988c.043.271-.144.529-.416.572zm10.87 0l4.653.737c.272.043.529-.144.572-.416l.156-.988c.043-.272-.144-.529-.416-.572l-4.653-.737c-.272-.043-.529.144-.572.416l-.156.988c-.043.271.144.529.416.572z"/><path fill="#99AAB5" d="M11.875 18s-.174 9 6.113 9 6.137-9 6.137-9H25s-.307 10-7 10-7-10-7-10h.875z"/><path fill="#F5F8FA" d="M17.5 31h1v5h-1z"/><path fill="#292F33" d="M21.38 27.816C21.38 29.391 19.144 30 18 30s-3.38-.609-3.38-2.184c0 0-.62-.127-.62 1.184s1.888 3 4 3 4-1.689 4-3-.62-1.184-.62-1.184z"/></svg>
\ No newline at end of file