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/1f468-200d-1f393.svg b/public/emoji/1f468-200d-1f393.svg
index 701bc5f3a..ab35970f5 100644
--- a/public/emoji/1f468-200d-1f393.svg
+++ b/public/emoji/1f468-200d-1f393.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 33,0 33,36 0,36 0,0 Z"/></clipPath><clipPath id="clipPath108" clipPathUnits="userSpaceOnUse"><path id="path110" 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(32,0)" id="g20"><path id="path22" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,2 c 0,3.314 -2.686,6 -6,6 l -16,0 c -3.313,0 -6,-2.686 -6,-6 l 0,-2 28,0 z"/></g><g transform="translate(10,8)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.313,0 -6,-2.686 -6,-6 l 0,-2 8,0 0,8 -2,0 z"/></g><g transform="translate(26,8)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 0,-8 8,0 0,2 C 6,-2.686 3.314,0 0,0"/></g><g transform="translate(11.8125,8)" id="g32"><path id="path34" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 12.375,0 c 0,0 -1.574,-4 -6.188,-4 C 1.574,-4 0,0 0,0"/></g><g transform="translate(13.6396,7.8936)" id="g36"><path id="path38" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.894 2.36,-1.992 4.36,-1.992 2,0 4.36,1.098 4.36,1.992 l 0,3.817 L 0,3.817 0,0 Z"/></g><g transform="translate(13.6318,10.0273)" id="g40"><path id="path42" style="fill:#f9ca55;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.216,-1.374 2.724,-1.746 4.364,-1.746 1.639,0 3.147,0.373 4.364,1.746 l 0,3.491 L 0,3.491 0,0 Z"/></g><g transform="translate(11.4443,20.0645)" id="g44"><path id="path46" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.734,-2.622 -1.639,-2.622 -0.905,0 -1.639,1.174 -1.639,2.622 0,1.448 0.734,2.623 1.639,2.623 C -0.734,2.623 0,1.448 0,0"/></g><g transform="translate(27.833,20.0645)" id="g48"><path id="path50" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.733,-2.622 -1.639,-2.622 -0.905,0 -1.638,1.174 -1.638,2.622 0,1.448 0.733,2.623 1.638,2.623 C -0.733,2.623 0,1.448 0,0"/></g><g transform="translate(9.4775,19.0405)" id="g52"><path id="path54" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.589 3.816,10.121 8.523,10.121 4.707,0 8.522,-4.532 8.522,-10.121 0,-5.589 -3.815,-10.121 -8.522,-10.121 C 3.816,-10.121 0,-5.589 0,0"/></g><g transform="translate(18,12.1982)" id="g56"><path id="path58" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.754,0 -3.6,0.705 -3.741,0.848 -0.256,0.256 -0.256,0.671 0,0.927 0.248,0.248 0.645,0.254 0.902,0.023 C -2.787,1.761 -2.118,1.311 0,1.311 c 2.2,0 2.836,0.485 2.842,0.49 C 3.098,2.056 3.499,2.044 3.755,1.786 4.011,1.53 3.997,1.104 3.741,0.848 3.6,0.705 2.754,0 0,0"/></g><g transform="translate(18,33)" id="g60"><path id="path62" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 5.648,0 9.178,-4.647 9.178,-8.121 0,-3.472 -0.971,-4.967 -1.412,-3.472 C 7,-9 6,-9 6,-9 c 0,0 -3.882,-1.538 -5.294,-0.147 0,0 2.118,-4.168 -2.118,0 0,0 0.706,-2.78 -3.53,0.693 0,0 -2.118,0.333 -2.824,-3.139 -0.196,-0.965 -1.412,0 -1.412,3.472 C -9.178,-4.647 -6.354,0 0,0"/></g><g transform="translate(14,19)" id="g64"><path id="path66" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.55,0 -1,0.45 -1,1 l 0,1 C -1,2.55 -0.55,3 0,3 0.55,3 1,2.55 1,2 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(22,19)" id="g68"><path id="path70" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.55,0 -1,0.45 -1,1 l 0,1 C -1,2.55 -0.55,3 0,3 0.55,3 1,2.55 1,2 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(18.75,16.25)" id="g72"><path id="path74" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.5,0 c -0.413,0 -0.75,0.337 -0.75,0.75 0,0.413 0.337,0.75 0.75,0.75 L 0,1.5 C 0.413,1.5 0.75,1.163 0.75,0.75 0.75,0.337 0.413,0 0,0"/></g><g transform="translate(12.3799,8)" id="g76"><path id="path78" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 1.542,-5.463 5.62,-7.411 l 0,-0.589 -7,0 0,8 L 0,0 Z"/></g><g transform="translate(23.6201,8)" id="g80"><path id="path82" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -1.542,-5.463 -5.62,-7.411 l 0,-0.589 7,0 0,8 L 0,0 Z"/></g><g transform="translate(8.083,2.6592)" id="g84"><path id="path86" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.251,0 0.401,-2.659 0.401,-2.659 l -0.956,0 C -0.555,-2.659 -0.362,0 0,0"/></g><g transform="translate(11.083,2.6592)" id="g88"><path id="path90" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.251,0 0.401,-2.659 0.401,-2.659 l -0.956,0 C -0.555,-2.659 -0.362,0 0,0"/></g><g transform="translate(27.9287,2.6592)" id="g92"><path id="path94" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.251,0 -0.401,-2.659 -0.401,-2.659 l 0.956,0 C 0.555,-2.659 0.361,0 0,0"/></g><g transform="translate(24.9287,2.6592)" id="g96"><path id="path98" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.251,0 -0.401,-2.659 -0.401,-2.659 l 0.956,0 C 0.555,-2.659 0.361,0 0,0"/></g></g></g><g transform="translate(18,28)" id="g100"><path id="path102" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -14,4 0,7 14,4 0,0 Z"/></g><g id="g104"><g clip-path="url(#clipPath108)" id="g106"><g transform="translate(6.0625,31.9307)" id="g112"><path id="path114" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 11.938,-3.411 23.875,0 11.938,2.558 0,0 Z m 11.938,-4.431 c -0.047,0 -0.093,0.007 -0.138,0.019 l -14,4 c -0.22,0.064 -0.37,0.269 -0.362,0.498 0.007,0.229 0.17,0.424 0.395,0.472 l 14,3 c 0.069,0.015 0.141,0.015 0.209,0 l 14,-3 C 26.267,0.51 26.43,0.315 26.437,0.086 26.445,-0.143 26.296,-0.348 26.075,-0.412 l -14,-4 C 12.03,-4.424 11.983,-4.431 11.938,-4.431"/></g><g transform="translate(27,28)" id="g116"><path id="path118" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -4.029,-3 -9,-3 -4.971,0 -9,0.791 -9,3 0,5 4.029,5 9,5 4.971,0 9,0 9,-5"/></g><g transform="translate(18,32.5)" id="g120"><path id="path122" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -5.429,0 -8.5,-0.209 -8.5,-4.5 -8.5,-6.065 -5.322,-7 0,-7 5.322,-7 8.5,-6.065 8.5,-4.5 8.5,-0.209 5.429,0 0,0 m 0,-8 c -6.215,0 -9.5,1.21 -9.5,3.5 C -9.5,1 -4.885,1 0,1 4.886,1 9.5,1 9.5,-4.5 9.5,-6.79 6.215,-8 0,-8"/></g><g transform="translate(18,27.5)" id="g124"><path id="path126" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.045,0 -0.091,0.006 -0.137,0.019 l -14,4 c -0.266,0.076 -0.42,0.353 -0.344,0.618 0.076,0.266 0.356,0.417 0.618,0.344 l 14.001,-4 C 0.403,0.905 0.557,0.628 0.48,0.363 0.418,0.143 0.218,0 0,0"/></g><g transform="translate(17.9995,27.5)" id="g128"><path id="path130" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.217,0 -0.417,0.143 -0.48,0.363 -0.076,0.265 0.078,0.542 0.343,0.618 l 14,4 C 14.131,5.055 14.405,4.902 14.481,4.637 14.557,4.372 14.404,4.095 14.138,4.019 l -14,-4 C 0.092,0.006 0.045,0 0,0"/></g><g transform="translate(5.9995,30.5)" id="g132"><path id="path134" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.257,0 -0.476,0.197 -0.498,0.458 -0.023,0.276 0.182,0.517 0.457,0.54 l 12,1 c 0.272,0.026 0.516,-0.181 0.54,-0.456 0.023,-0.276 -0.182,-0.517 -0.457,-0.54 l -12,-1 C 0.028,0 0.014,0 0,0"/></g><g transform="translate(6,20.5625)" id="g136"><path id="path138" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.276,0 -0.5,0.224 -0.5,0.5 l 0,9.938 c 0,0.276 0.224,0.5 0.5,0.5 0.276,0 0.5,-0.224 0.5,-0.5 L 0.5,0.5 C 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(7,22.5)" id="g140"><path id="path142" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.485 -0.448,-4.5 -1,-4.5 -0.552,0 -1,2.015 -1,4.5 0,2.485 0.448,2.5 1,2.5 0.552,0 1,-0.015 1,-2.5"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M26 28H10c-3.313 0-6 2.686-6 6v2h28v-2c0-3.314-2.685-6-6-6z"/><path fill="#66757F" d="M8.083 33.341c.251 0 .401 2.659.401 2.659h-.956s.193-2.659.555-2.659m3 0c.251 0 .401 2.659.401 2.659h-.957c.001 0 .194-2.659.556-2.659m13.846 0c-.251 0-.401 2.659-.401 2.659h.956c-.001 0-.194-2.659-.555-2.659m3 0c-.251 0-.401 2.659-.401 2.659h.956c-.001 0-.194-2.659-.555-2.659"/><path fill="#77B255" d="M12.38 28s.24.838.77 1.971c.827 1.766 2.366 4.254 4.85 5.441 2.485-1.187 4.024-3.675 4.85-5.441.53-1.133.77-1.971.77-1.971H12.38z"/><path fill="#5C913B" d="M18 32c2.329 0 3.882-1.02 4.85-2.029.53-1.133.77-1.971.77-1.971H12.38s.24.838.77 1.971C14.118 30.98 15.671 32 18 32z"/><path fill="#FFDC5D" d="M13.64 28.106c0 .894 2.36 1.993 4.36 1.993s4.359-1.099 4.359-1.992V24.29h-8.72v3.816z"/><path fill="#F9CA55" d="M13.632 25.973c1.216 1.374 2.724 1.746 4.364 1.746 1.639 0 3.146-.373 4.363-1.746v-3.491h-8.728v3.491z"/><path fill="#FFDC5D" d="M11.444 15.936c0 1.448-.734 2.622-1.639 2.622s-1.639-1.174-1.639-2.622.734-2.623 1.639-2.623c.905-.001 1.639 1.174 1.639 2.623m16.389 0c0 1.448-.733 2.622-1.639 2.622-.905 0-1.639-1.174-1.639-2.622s.733-2.623 1.639-2.623c.906-.001 1.639 1.174 1.639 2.623"/><path fill="#FFDC5D" d="M9.477 16.959c0-5.589 3.816-10.121 8.523-10.121s8.522 4.532 8.522 10.121S22.707 27.08 18 27.08c-4.707 0-8.523-4.531-8.523-10.121"/><path fill="#C1694F" d="M18 23.802c-2.754 0-3.6-.705-3.741-.848-.256-.256-.256-.671 0-.927.248-.248.646-.255.902-.023.052.037.721.487 2.839.487 2.2 0 2.836-.485 2.842-.49.256-.255.657-.243.913.015.256.256.242.683-.014.938-.141.143-.987.848-3.741.848m.75-4.052h-1.5c-.413 0-.75-.337-.75-.75s.337-.75.75-.75h1.5c.413 0 .75.337.75.75s-.337.75-.75.75"/><path fill="#662113" d="M14 17c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1m8 0c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1"/><path fill="#FFAC33" d="M18 3c5.648 0 9.178 4.648 9.178 8.121 0 3.473-.971 4.968-1.412 3.473C25 12 24 12 24 12s-3.882 1.538-5.294.148c0 0 2.118 4.168-2.118 0 0 0 .706 2.779-3.53-.694 0 0-2.118-.333-2.824 3.14-.196.964-1.412 0-1.412-3.473S11.646 3 18 3"/><path fill="#292F33" d="M32.104 3.511l-14-3c-.068-.015-.14-.015-.209 0l-14 3c-.224.048-.387.243-.395.472-.007.229.142.434.363.498l4.944 1.413C8.615 6.489 8.5 7.176 8.5 8c0 2.29 3.285 3.5 9.5 3.5s9.5-1.21 9.5-3.5c0-.824-.115-1.511-.307-2.106l4.945-1.413c.221-.063.37-.269.362-.498-.008-.229-.171-.424-.396-.472z"/><path fill="#66757F" d="M32.48 3.863c-.076-.265-.35-.417-.618-.344L18 7.48 4.137 3.519c-.262-.073-.542.078-.618.344-.076.265.078.542.344.618l14 4c.045.013.091.019.136.019.045 0 .092-.006.137-.019l14-4c.267-.076.421-.353.344-.618z"/><path fill="#FFCC4D" d="M17.958 3.502l-12 1c-.026.002-.458.057-.458.498v6.095c-.299.186-.5.74-.5 2.405 0 2.485.448 4.5 1 4.5s1-2.015 1-4.5c0-1.665-.201-2.219-.5-2.405V5.46l11.542-.962c.274-.023.479-.264.456-.54-.023-.275-.268-.482-.54-.456z"/></svg>
\ No newline at end of file