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/1f645-1f3fd-200d-2642-fe0f.svg b/public/emoji/1f645-1f3fd-200d-2642-fe0f.svg
index d6d2b153b..50a2cecdc 100644
--- a/public/emoji/1f645-1f3fd-200d-2642-fe0f.svg
+++ b/public/emoji/1f645-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,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath76" clipPathUnits="userSpaceOnUse"><path id="path78" d="M 4,15 13,8 9,0 27,0 c 0,0 4,9 0,9 L 27,9 4,21 4,15 Z"/></clipPath><clipPath id="clipPath88" clipPathUnits="userSpaceOnUse"><path id="path90" 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(9,30.0625)" id="g20"><path id="path22" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-11.063 c 0,-4.97 4.029,-8.999 9,-8.999 4.971,0 9,4.029 9,8.999 L 18,-0.312 0,0 Z"/></g><g transform="translate(14,14)" id="g24"><path id="path26" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 4,0 8,0 C 8,0 7,-2 4,-2 1,-2 0,0 0,0"/></g><g transform="translate(14,20)" id="g28"><path id="path30" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.552,3 0,3 0.552,3 1,2.552 1,2 L 1,1 C 1,0.448 0.552,0 0,0"/></g><g transform="translate(22,20)" id="g32"><path id="path34" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.552,3 0,3 0.552,3 1,2.552 1,2 L 1,1 C 1,0.448 0.552,0 0,0"/></g><g transform="translate(19,16.5)" id="g36"><path id="path38" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2,0 C -2.276,0 -2.5,0.224 -2.5,0.5 -2.5,0.776 -2.276,1 -2,1 L 0,1 C 0.276,1 0.5,0.776 0.5,0.5 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(10.8472,22.2848)" id="g40"><path id="path42" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.58 -0.801,-2.861 -1.788,-2.861 -0.988,0 -1.788,1.281 -1.788,2.861 0,1.58 0.8,2.861 1.788,2.861 C -0.801,2.861 0,1.58 0,0"/></g><g transform="translate(28.7292,22.2848)" id="g44"><path id="path46" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.58 -0.8,-2.861 -1.788,-2.861 -0.988,0 -1.788,1.281 -1.788,2.861 0,1.58 0.8,2.861 1.788,2.861 C -0.8,2.861 0,1.58 0,0"/></g><g transform="translate(18,35.1772)" id="g48"><path id="path50" style="fill:#963b22;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -7.019,0 -10.139,-4.684 -10.139,-8.588 0,-3.903 1.343,-4.986 1.56,-3.903 0.78,3.903 3.119,5.102 3.119,5.102 4.68,-3.904 3.9,-0.781 3.9,-0.781 4.68,-4.684 2.34,0 2.34,0 1.56,-1.562 6.239,-1.562 6.239,-1.562 0,0 0.78,-1.198 1.56,-2.759 0.78,-1.561 1.56,0 1.56,3.903 C 10.139,-4.684 6.239,0 0,0"/></g><g transform="translate(27,9)" id="g52"><path id="path54" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,0 -16,0 -1,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-5 5,0 16,0 5,0 0,5 C 4,-1.791 2.209,0 0,0"/></g><g transform="translate(27,0)" id="g56"><path id="path58" style="fill:#2a6797;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -15.001,9 -17,8 -3,0 0,0 Z"/></g><g transform="translate(2.6553,21.9839)" id="g60"><path id="path62" style="fill:#cc9b7a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.075,0.363 0,0.653 C -0.149,1.016 -0.219,0.987 -0.292,0.971 -0.567,1.415 -1.09,1.669 -1.632,1.557 -2.325,1.414 -2.771,0.735 -2.629,0.04 l 0.554,-2.674 0,-2.35 c 0,-1.104 0.895,-2 2,-2 l 1,0 1,0 0,5 c 0,0 -0.856,1.895 -1.925,1.984"/></g><g transform="translate(1.5801,28)" id="g64"><path id="path66" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,-0.447 -1,-1 l 1,-6 0,-5 c 0,-0.553 0.448,-1 1,-1 l 2,0 0,2 L 2.42,-7 1,-1 C 1,-1 0.553,0 0,0"/></g><g transform="translate(27,9)" id="g68"><path id="path70" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 4,0 0,-9 0,-9 L -23,6 -23,12 0,0 Z"/></g></g></g><g id="g72"><g clip-path="url(#clipPath76)" id="g74"><g transform="translate(22,12)" id="g80"><path id="path82" style="fill:#2a6797;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4,3 -12,-1 -9.001,-3 0,0 Z m 6,-2 -16,-10 -3,0 17,11 2,-1 z"/></g></g></g><g id="g84"><g clip-path="url(#clipPath88)" id="g86"><g transform="translate(34.9766,23.541)" id="g92"><path id="path94" style="fill:#cc9b7a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.541,0.112 -1.064,-0.142 -1.341,-0.586 -0.071,0.016 -0.142,0.045 -0.216,0.045 l 0,-0.653 -0.075,-0.363 c -1.069,-0.089 -1.925,-1.984 -1.925,-1.984 l 0,-5 1,0 1,0 c 1.105,0 2,0.896 2,2 l 0,2.35 0.554,2.674 C 1.139,-0.822 0.693,-0.143 0,0"/></g><g transform="translate(34.4199,28)" id="g96"><path id="path98" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.552,0 1,-0.447 1,-1 l -1,-6 0,-5 c 0,-0.553 -0.448,-1 -1,-1 l -2,0 0,2 0.58,4 1.42,6 c 0,0 0.447,1 1,1"/></g><g transform="translate(9,9)" id="g100"><path id="path102" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,-9 23,6 23,12 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#D5AB88" d="M28.729 13.715c0-1.548-.769-2.801-1.729-2.852V6.25L9 5.938v4.926c-.96.051-1.729 1.304-1.729 2.852 0 1.548.77 2.801 1.729 2.852V17c0 4.971 4.029 9 9 9s9-4.029 9-9v-.433c.96-.051 1.729-1.304 1.729-2.852z"/><path fill="#963B22" d="M18 .823c-7.019 0-10.139 4.684-10.139 8.588 0 3.903 1.343 4.986 1.56 3.903.78-3.903 3.12-5.101 3.12-5.101 4.68 3.904 3.9.781 3.9.781 4.679 4.684 2.34 0 2.34 0 1.56 1.562 6.239 1.562 6.239 1.562s.78 1.198 1.559 2.759c.78 1.562 1.56 0 1.56-3.903 0-3.905-3.9-8.589-10.139-8.589z"/><path fill="#C1694F" d="M14 22h8s-1 2-4 2-4-2-4-2z"/><path fill="#4289C1" d="M27 27H9c-2.209 0-4 1.791-4 4v5h26v-5c0-2.209-1.791-4-4-4z"/><path fill="#CC9B7A" d="M2.58 13c-.074 0-1.015-.653-1.557-.541-.693.144-1.139.822-.997 1.517L.58 16.65V19c0 1.104.896 2 2 2h2l-2-8z"/><path fill="#D5AB88" d="M1.58 8c-.552 0-1 .447-1 1l1 6v5c0 .553.448 1 1 1h2v-2L4 15 2.58 9s-.447-1-1-1z"/><path fill="#4289C1" d="M27 27c4 0 0 9 0 9L4 21v-6l23 12z"/><path fill="#2A6797" d="M19.347 31.408l7.326-4.579-1.938-1.011L9 36h3l5.731-3.582L24 36h3zm2.195-7.255l-4.819-2.515-6.647 3.324 3.056 1.994z"/><path fill="#CC9B7A" d="M34.977 12.459c-.541-.112-1.064.142-1.341.586C33.564 13.029 31.42 21 31.42 21h2c1.104 0 2-.896 2-2v-2.35l.554-2.675c.141-.694-.304-1.373-.997-1.516z"/><path fill="#D5AB88" d="M34.42 8c.552 0 1 .447 1 1l-1 6v5c0 .553-.448 1-1 1h-2v-2l.58-4 1.42-6s.447-1 1-1z"/><path fill="#4289C1" d="M32 15L9 27c-2.209 0-4 1.791-4 4v5h4l9.035-5.846L18 30.13 32 21v-6z"/><path fill="#C1694F" d="M19 19.5h-2c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h2c.276 0 .5.224.5.5s-.224.5-.5.5z"/><path fill="#662113" d="M14 16c-.552 0-1-.448-1-1v-1c0-.552.448-1 1-1s1 .448 1 1v1c0 .552-.448 1-1 1zm8 0c-.552 0-1-.448-1-1v-1c0-.552.448-1 1-1s1 .448 1 1v1c0 .552-.448 1-1 1z"/></svg>
\ No newline at end of file