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/1f304.svg b/public/emoji/1f304.svg
index 9b9aab4d6..0709f1c47 100644
--- a/public/emoji/1f304.svg
+++ b/public/emoji/1f304.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 4,36 C 1.791,36 0,34.209 0,32 L 0,32 0,4 C 0,1.791 1.791,0 4,0 l 0,0 28,0 c 2.209,0 4,1.791 4,4 l 0,0 0,28 c 0,2.209 -1.791,4 -4,4 l 0,0 -28,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"><path id="path20" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 37,-1 -38,0 0,38 38,0 0,-38 z"/><g transform="translate(32.1143,17.2637)" id="g22"><path id="path24" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.587,0.451 1.587,1.147 0.001,1.599 l -0.559,0.153 -0.556,0.164 0,-0.005 -2.941,0.891 2.323,1.934 -0.013,0 0.493,0.322 0.497,0.359 C 0.536,6.44 0.253,7.104 -1.384,6.915 l -0.636,-0.09 -0.632,-0.089 -0.002,0 -2.979,-0.339 1.77,3.18 0.309,0.558 c 0.802,1.44 0.281,1.963 -1.158,1.162 l -0.559,-0.28 -0.555,-0.281 -0.002,0 -2.626,-1.489 0.34,2.947 0,0.003 0.08,0.633 0.077,0.637 c 0.188,1.634 -0.492,1.915 -1.516,0.623 l -0.394,-0.499 -2.257,-2.85 -0.819,2.881 c -0.001,10e-4 -0.001,0.002 -0.002,0.004 l -0.349,1.225 c -0.451,1.587 -1.189,1.587 -1.641,0 l -0.174,-0.613 -0.174,-0.612 -0.821,-2.885 -1.861,2.35 c -0.001,0 -0.001,0.001 -0.002,0.001 l -0.395,0.499 -0.397,0.502 c -1.023,1.289 -1.704,1.007 -1.515,-0.629 l 0.074,-0.634 0.073,-0.633 0,-10e-4 0.346,-2.979 -3.177,1.77 -0.556,0.31 c -1.442,0.803 -1.964,0.281 -1.161,-1.161 l 0.31,-0.556 1.77,-3.177 -2.979,0.346 -10e-4,0 -0.633,0.073 -0.634,0.074 c -1.636,0.189 -1.918,-0.492 -0.629,-1.515 l 0.502,-0.397 0.499,-0.395 c 0,-0.001 10e-4,-0.001 10e-4,-0.002 l 2.35,-1.861 -2.885,-0.821 -0.612,-0.174 -0.613,-0.174 c -1.587,-0.452 -1.587,-1.19 0,-1.642 l 1.225,-0.348 c 0.002,-0.001 0.003,-0.001 0.004,-0.002 l 2.881,-0.819 -2.85,-2.258 -0.499,-0.395 c -1.292,-1.024 -1.011,-1.705 0.623,-1.517 l 0.637,0.08 0.633,0.08 0.002,0 2.948,0.34 -1.489,-2.626 0,-0.002 -0.281,-0.555 -0.296,-0.559 c -0.8,-1.439 -0.27,-1.96 1.169,-1.158 l 0.56,0.309 3.185,1.77 -0.337,-2.979 0,-0.002 -0.08,-0.631 -0.077,-0.635 c -0.189,-1.637 0.491,-1.918 1.515,-0.627 l 0.395,0.5 0.395,0.5 1.862,2.351 0.82,-2.884 0.001,-0.001 0.174,-0.613 0.174,-0.613 c 0.452,-1.586 1.106,-1.586 1.557,10e-4 l 0.264,1.225 0,0.004 0.905,2.881 1.905,-2.351 0.416,-0.5 0.408,-0.5 c 1.022,-1.29 1.709,-1.01 1.521,0.625 l -0.078,0.637 -0.077,0.632 0,0.003 -0.34,2.948 2.624,-1.49 0.002,0 0.557,-0.28 0.557,-0.295 c 1.441,-0.803 1.963,-0.272 1.16,1.167 l -0.28,0.561 -0.28,0.557 0,0.002 -1.49,2.628 2.948,-0.34 0.003,0 0.632,-0.08 0.637,-0.077 c 1.635,-0.188 1.915,0.492 0.625,1.515 l -0.5,0.395 -0.5,0.395 -2.351,1.947 2.881,0.905 0.004,0 L 0,0 Z"/></g><g transform="translate(27.6299,17.999)" id="g26"><path id="path28" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-5.318 -4.311,-9.629 -9.63,-9.629 -5.318,0 -9.629,4.311 -9.629,9.629 0,5.318 4.311,9.629 9.629,9.629 C -4.311,9.629 0,5.318 0,0"/></g><g transform="translate(38,6)" id="g30"><path id="path32" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -9,13 -13,13 -17,13 -26,0 -26,0 l 0,-6 26,0 0,6 z"/></g><g transform="translate(-4,0)" id="g34"><path id="path36" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 9,13 13,13 17,13 26,0 26,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCC4D" d="M32 0H4C1.791 0 0 1.791 0 4v27h36V4c0-2.209-1.791-4-4-4z"/><path fill="#F4900C" d="M32.114 18.736c1.587-.451 1.587-1.147.001-1.599l-.559-.154L31 16.82v.005l-2.94-.891L30.383 14h-.014l.493-.322.497-.359c1.291-1.023 1.008-1.686-.629-1.498l-.636.089-.632.09h-.002l-2.979.339 1.77-3.18.309-.558c.802-1.44.281-1.963-1.158-1.163l-.558.282-.556.28h-.002L23.66 9.489 24 6.543V6.54l.08-.632.077-.638c.188-1.634-.492-1.915-1.516-.623l-.394.499-2.257 2.85-.819-2.881-.002-.005-.348-1.225c-.451-1.587-1.19-1.587-1.642 0l-.174.612-.174.613-.821 2.886-1.861-2.35-.001-.001-.395-.499-.397-.501c-1.023-1.29-1.704-1.007-1.515.629l.074.634.073.632v.001l.346 2.979-3.177-1.77-.557-.31c-1.441-.803-1.963-.281-1.161 1.16l.31.556 1.77 3.177-2.979-.346h-.001l-.632-.073-.635-.074c-1.636-.189-1.918.492-.629 1.515l.501.397.499.395.001.001 2.35 1.861-2.884.822-.612.174-.612.174c-1.587.452-1.587 1.19 0 1.642l1.225.348.004.002 2.881.819-2.851 2.258-.499.396c-1.292 1.023-1.011 1.705.623 1.517l.638-.08.632-.081h.002l2.948-.34L8 26.286v.002l-.28.556-.296.558c-.8 1.44-.271 1.96 1.169 1.158l.56-.309 3.185-1.77L12 29.46v.002l-.08.632-.077.635c-.189 1.637.491 1.918 1.514.627l.396-.5.395-.5 1.862-2.352.82 2.885v.001l.174.612.175.613c.452 1.586 1.105 1.586 1.557-.001L19 30.89v-.004l.905-2.882 1.905 2.352.416.5.407.5c1.022 1.29 1.71 1.01 1.521-.625l-.078-.637-.076-.633v-.003l-.34-2.947L26.284 28h.002l.557.28.558.295c1.44.803 1.963.272 1.16-1.167l-.28-.561L28 26.29v-.002l-1.489-2.628 2.947.34h.003l.633.08.637.077c1.635.189 1.915-.492.625-1.515l-.5-.396-.5-.395-2.352-1.947L30.886 19h.004l1.224-.264z"/><circle fill="#FFE8B6" cx="18" cy="18" r="9.63"/><path fill="#5C913B" d="M36 32v-4.739C33.114 23.448 27.818 17 25 17c-2.678 0-7.594 5.823-10.553 9.675V36H32c2.209 0 4-1.791 4-4z"/><path fill="#3E721D" d="M9 23c-2.249 0-6.078 4.109-9 7.707V32c0 2.209 1.791 4 4 4h18s-3.796-5.481-7.553-9.325C12.419 24.6 10.402 23 9 23z"/></svg>
\ No newline at end of file