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/1f3ea.svg b/public/emoji/1f3ea.svg
index 73b362028..87f3f963e 100644
--- a/public/emoji/1f3ea.svg
+++ b/public/emoji/1f3ea.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(17,2)" id="g20"><path id="path22" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 0.896,-2 2,-2 l 14,0 c 1.105,0 2,0.895 2,2 l 0,16 c 0,1.105 -0.895,2 -2,2 L 2,18 C 0.896,18 0,17.105 0,16 L 0,0 Z"/></g><g transform="translate(33,20)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -10,0 0,-2 12,0 C 2,-0.895 1.105,0 0,0"/></g><path id="path28" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 33,2 3,2 3,6 33,6 33,2 Z"/><g transform="translate(3,20)" id="g30"><path id="path32" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.104,0 -2,-0.895 -2,-2 l 0,-16 c 0,-1.105 0.896,-2 2,-2 l 20,0 0,20 -20,0 z"/></g><g transform="translate(3,20)" id="g34"><path id="path36" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.104,0 -2,-0.895 -2,-2 L 20,-2 20,0 0,0 Z"/></g><path id="path38" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3,12 4,0 0,4 -4,0 0,-4 z"/><path id="path40" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 17,12 4,0 0,4 -4,0 0,-4 z"/><path id="path42" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 10,12 4,0 0,4 -4,0 0,-4 z"/><path id="path44" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 33,12 -4,0 0,4 4,0 0,-4 z"/><path id="path46" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 27,12 -4,0 0,4 4,0 0,-4 z"/><path id="path48" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 21,0 3,0 3,6 21,6 21,0 Z"/><path id="path50" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 17,0 7,0 7,6 17,6 17,0 Z"/><path id="path52" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 23,10 1,10 1,6 23,6 23,10 Z"/><path id="path54" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 17,7 7,7 7,9 17,9 17,7 Z"/><path id="path56" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 15,7 9,7 9,9 15,9 15,7 Z"/><path id="path58" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 35,6 -12,0 0,4 12,0 0,-4 z"/><path id="path60" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 7,20 -2,0 0,2 2,0 0,-2 z"/><path id="path62" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 17,20 2,0 0,2 -2,0 0,-2 z"/><g transform="translate(21,24)" id="g64"><path id="path66" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -14,0 c -1.104,0 -2,0.896 -2,2 l 0,10 c 0,1.104 0.896,2 2,2 l 14,0 c 1.105,0 2,-0.896 2,-2 L 0,0 Z"/></g><g transform="translate(10.5615,25.8491)" id="g68"><path id="path70" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.616,0 1.093,-0.28 1.093,-0.925 0,-0.644 -0.477,-0.924 -1.009,-0.924 l -4.678,0 c -0.617,0 -1.093,0.28 -1.093,0.924 0,0.295 0.182,0.547 0.322,0.715 1.163,1.386 2.424,2.647 3.488,4.188 0.252,0.364 0.49,0.798 0.49,1.303 0,0.574 -0.434,1.078 -1.008,1.078 -1.611,0 -0.841,-2.269 -2.186,-2.269 -0.672,0 -1.022,0.476 -1.022,1.023 0,1.764 1.569,3.179 3.292,3.179 1.723,0 3.109,-1.134 3.109,-2.913 C 0.798,3.432 -1.373,1.499 -2.563,0 L 0,0 Z"/></g><g transform="translate(16.3003,31.9561)" id="g72"><path id="path74" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.028,0 -1.919,-3.908 0,-3.908 0,0 Z m -3.376,-5.757 c -0.687,0 -0.981,0.463 -0.981,0.826 0,0.309 0.112,0.477 0.197,0.617 l 3.137,5.687 c 0.309,0.56 0.701,0.813 1.429,0.813 0.813,0 1.611,-0.519 1.611,-1.793 l 0,-4.301 0.238,0 c 0.546,0 0.981,-0.364 0.981,-0.925 0,-0.56 -0.435,-0.924 -0.981,-0.924 l -0.238,0 0,-1.19 C 2.017,-7.69 1.723,-8.04 1.008,-8.04 0.294,-8.04 0,-7.69 0,-6.947 l 0,1.19 -3.376,0 z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#AAB8C2" d="M17 34c0 1.104.896 2 2 2h14c1.104 0 2-.896 2-2V18c0-1.104-.896-2-2-2H19c-1.104 0-2 .896-2 2v16z"/><path fill="#292F33" d="M33 16H23v2h12c0-1.104-.896-2-2-2z"/><path fill="#3B88C3" d="M3 30h30v4H3z"/><path fill="#CCD6DD" d="M3 16c-1.104 0-2 .896-2 2v16c0 1.104.896 2 2 2h20V16H3z"/><path fill="#66757F" d="M3 16c-1.104 0-2 .896-2 2h22v-2H3z"/><path fill="#55ACEE" d="M3 20h4v4H3zm14 0h4v4h-4zm-7 0h4v4h-4z"/><path fill="#3B88C3" d="M29 20h4v4h-4zm-6 0h4v4h-4z"/><path fill="#55ACEE" d="M3 30h18v6H3z"/><path fill="#3B88C3" d="M7 30h10v6H7z"/><path fill="#DD2E44" d="M1 26h22v4H1z"/><path fill="#F4ABBA" d="M7 27h10v2H7z"/><path fill="#FFF" d="M9 27h6v2H9z"/><path fill="#A0041E" d="M23 26h12v4H23z"/><path fill="#292F33" d="M5 14h2v2H5zm12 0h2v2h-2z"/><path fill="#DD2E44" d="M21 12c0 1.104-.896 2-2 2H5c-1.104 0-2-.896-2-2V2c0-1.104.896-2 2-2h14c1.104 0 2 .896 2 2v10z"/><path d="M10.561 10.151c.616 0 1.093.28 1.093.925 0 .644-.477.924-1.009.924H5.967c-.617 0-1.093-.28-1.093-.924 0-.294.182-.546.322-.714C6.359 8.975 7.62 7.714 8.685 6.173c.252-.364.49-.798.49-1.303 0-.574-.434-1.079-1.009-1.079-1.611 0-.84 2.269-2.185 2.269-.672 0-1.022-.476-1.022-1.022 0-1.765 1.569-3.18 3.292-3.18 1.723 0 3.109 1.135 3.109 2.914 0 1.947-2.171 3.88-3.362 5.379h2.563zm2.363-.35c-.687 0-.981-.462-.981-.826 0-.309.112-.477.196-.617l3.138-5.687c.308-.56.7-.813 1.429-.813.812 0 1.611.519 1.611 1.793v4.3h.238c.546 0 .98.364.98.925 0 .56-.434.924-.98.924h-.238v1.19c0 .743-.295 1.093-1.009 1.093s-1.008-.35-1.008-1.093V9.8h-3.376zM16.3 4.044h-.028l-1.891 3.908H16.3V4.044z" fill="#FFF"/></svg>
\ No newline at end of file