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/1f930-1f3fe.svg b/public/emoji/1f930-1f3fe.svg
index 3a6ac0c1f..ee049b84b 100644
--- a/public/emoji/1f930-1f3fe.svg
+++ b/public/emoji/1f930-1f3fe.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(22.123,22.2222)" id="g20"><path id="path22" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.444,0 c -1.793,0 -3.333,-1.541 -3.333,-3.333 l 0,-18.889 10.654,0 0,8.956 0.457,1.752 0,8.181 C 3.334,-1.541 1.793,0 0,0"/></g><g transform="translate(18,19.5)" id="g24"><path id="path26" style="fill:#7450a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.485,0 -4.5,-2.015 -4.5,-4.5 -4.5,-6.985 -2.485,-9 0,-9 l 0,9 z"/></g><g transform="translate(18,18.5)" id="g28"><path id="path30" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.933,0 -3.5,-1.567 -3.5,-3.5 -3.5,-5.433 -1.933,-7 0,-7 l 0,7 z"/></g><g transform="translate(20,19.5)" id="g32"><path id="path34" style="fill:#7450a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.485,0 -4.5,-2.015 -4.5,-4.5 -4.5,-6.985 -2.485,-9 0,-9 l 0,9 z"/></g><g transform="translate(20,18.5)" id="g36"><path id="path38" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.933,0 -3.5,-1.567 -3.5,-3.5 -3.5,-5.433 -1.933,-7 0,-7 l 0,7 z"/></g><g transform="translate(11.8135,0)" id="g40"><path id="path42" style="fill:#7450a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 7.154,0 0,14.25 c -0.453,0.076 -0.916,0.125 -1.391,0.125 -4.61,0 -8.347,-3.737 -8.347,-8.347 C -2.584,3.656 -1.589,1.52 0,0"/></g><g transform="translate(18.79,17.8294)" id="g44"><path id="path46" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-4.491 c -0.396,0.066 -0.799,0.109 -1.213,0.109 -4.098,0 -7.42,-3.321 -7.42,-7.419 0,-2.486 1.228,-4.682 3.106,-6.028 l 10.696,0 0,20.667 L 0,0 Z"/></g><g transform="translate(24.4375,20)" id="g48"><path id="path50" style="fill:#7450a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 4.851,-5.114 -4.289,-4.511 -0.001,-3.046 -3.941,-2.674 -2.641,4.139 5.646,5.81 -1.939,1.923 L 0,0 Z"/></g><g transform="translate(24.4375,21.25)" id="g52"><path id="path54" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 5.464,-5.694 c 0,0 1.897,-1.529 0,-3.333 -1.139,-1.083 -8.277,-5.89 -8.277,-5.89 l -2.221,2.222 6.054,5.889 -3.334,3.334 L 0,0 Z"/></g><g transform="translate(20.3311,8.4678)" id="g56"><path id="path58" style="fill:#9b6a49;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.124,0.535 -2.19,0.461 -3.221,-0.142 -3.713,-0.431 -3.915,-0.971 -3.16,-1.149 -2.402,-1.327 0,0 0,0"/></g><g transform="translate(21.8447,6.5508)" id="g60"><path id="path62" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.139,-1.765 -2.227,-3.414 -4.02,-3.199 -1.282,0.154 -2.397,3.608 -0.877,4.053 1.357,0.396 1.731,1.627 3.34,1.167 C -0.278,1.656 -0.051,0.678 0,0"/></g><g transform="translate(20.6592,5.8682)" id="g64"><path id="path66" style="fill:#90603e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.212,0.441 c 0,0 -0.77,-1.147 -1.843,-1.589 -0.813,-0.332 -1.498,-0.366 -1.857,-0.306 0.154,-0.293 0.157,-0.343 0.359,-0.53 C -2.436,-2.024 -0.651,-1.425 0,0"/></g><g transform="translate(18.4419,5.9072)" id="g68"><path id="path70" style="fill:#90603e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.99,0.678 1.279,1.326 1.279,1.326 L 0.956,1.735 c 0,0 -1.145,-1.776 -3.177,-1.684 0.015,-0.248 -0.006,-0.296 0.068,-0.55 C -1.88,-0.509 -0.804,-0.55 0,0"/></g><g transform="translate(15.5732,31.1909)" id="g72"><path id="path74" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.576,-1.385 -0.072,-2.969 -1.446,-3.54 -1.376,-0.571 -2.956,0.087 -3.531,1.472 -0.575,1.384 0.072,2.969 1.448,3.54 C -2.154,2.044 -0.574,1.385 0,0"/></g><g transform="translate(20.9832,24.2014)" id="g76"><path id="path78" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.203,1.435 1.921,3.269 1.304,4.751 l -1.02,2.457 c -5.514,-2.076 -7.782,0.773 -7.782,0.773 0,0 1.079,-2.598 -1.239,-3.922 l 1.233,-2.967 c 1.009,-2.424 2.382,-4.161 4.803,-3.165 L -2.618,-2.4 c 0.205,-0.816 0.055,-1.478 1.258,-1.524 0.841,-0.032 1.976,1.47 1.771,2.287 L 0,0 Z"/></g><g transform="translate(27.4102,30.5884)" id="g80"><path id="path82" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.824,2.202 -1.159,3.876 -2.847,4.048 -1.024,0.104 -1.947,-0.549 -2.398,-1.331 -2.051,3.434 -5.119,2.625 -7.07,1.938 -2.069,-0.727 -5.145,-2.868 -3.938,-5.17 1.207,-2.301 5.238,-1.312 5.238,-1.312 l 1.46,-2.352 c -0.394,2.024 0.949,2.476 1.571,2.035 0.654,-0.465 0.219,-1.957 0.517,-2.544 0.298,-0.588 1.33,-1.394 1.33,-1.394 0.634,0.805 2.635,3.578 1.7,6.935 0.387,0.145 0.968,0.047 1.438,-0.198 1.192,-0.618 0.253,-3.702 1.911,-4.677 1.589,-0.935 2.522,0.35 2.522,0.35 C -0.196,-3.727 -0.787,-2.105 0,0"/></g><g transform="translate(14.3418,24.2183)" id="g84"><path id="path86" style="fill:#915a34;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.308,-0.128 c -0.135,-0.056 -0.291,0.006 -0.347,0.143 -0.055,0.135 0.009,0.29 0.143,0.346 l 0.309,0.128 C -0.067,0.546 0.088,0.481 0.144,0.347 0.2,0.21 0.135,0.057 0,0"/></g><g transform="translate(14.4932,26.2886)" id="g88"><path id="path90" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.27,-0.112 -0.58,0.017 -0.692,0.286 l -0.205,0.491 c -0.112,0.268 0.017,0.58 0.287,0.692 0.271,0.112 0.582,-0.017 0.694,-0.285 L 0.287,0.693 C 0.399,0.423 0.272,0.112 0,0"/></g><g transform="translate(14.7612,23.0171)" id="g92"><path id="path94" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.243,-0.295 0.509,-0.541 0.796,-0.733 1.852,-0.125 1.925,0.8 1.925,0.8 1.925,0.8 0.989,0.411 0.051,0.02 0.032,0.013 0.019,0.008 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#9268CA" d="M22.123 13.778h-4.444c-1.793 0-3.333 1.541-3.333 3.333V36H25v-8.956l.457-1.752v-8.181c0-1.793-1.541-3.333-3.334-3.333z"/><path fill="#7450A8" d="M18 16.5c-2.485 0-4.5 2.015-4.5 4.5s2.015 4.5 4.5 4.5v-9z"/><path fill="#9268CA" d="M18 17.5c-1.933 0-3.5 1.567-3.5 3.5s1.567 3.5 3.5 3.5v-7z"/><path fill="#7450A8" d="M20 16.5c-2.485 0-4.5 2.015-4.5 4.5s2.015 4.5 4.5 4.5v-9z"/><path fill="#9268CA" d="M20 17.5c-1.933 0-3.5 1.567-3.5 3.5s1.567 3.5 3.5 3.5v-7z"/><path fill="#7450A8" d="M11.814 36h7.154V21.75c-.453-.076-.916-.125-1.391-.125-4.61 0-8.347 3.737-8.347 8.347 0 2.372.994 4.508 2.584 6.028z"/><path fill="#9268CA" d="M18.79 18.171v4.491c-.396-.066-.799-.109-1.213-.109-4.098 0-7.419 3.321-7.419 7.419 0 2.486 1.228 4.682 3.105 6.028h10.696V15.333l-5.169 2.838z"/><path fill="#7450A8" d="M24.438 16l4.85 5.114L25 25.625l-.002 3.046-3.94 2.674-2.641-4.139 5.645-5.81-1.939-1.923z"/><path fill="#9268CA" d="M24.438 14.75l5.464 5.694s1.897 1.528 0 3.333c-1.139 1.083-8.276 5.89-8.276 5.89l-2.222-2.222 6.054-5.89-3.334-3.333 2.314-3.472z"/><path fill="#9B6A49" d="M20.331 27.532c-1.124-.535-2.19-.461-3.221.142-.493.289-.694.829.061 1.008.758.177 3.16-1.15 3.16-1.15z"/><path fill="#AF7E57" d="M21.845 29.449c.139 1.765-2.226 3.414-4.02 3.199-1.282-.154-2.398-3.608-.877-4.053 1.356-.396 1.731-1.628 3.34-1.168 1.278.366 1.506 1.344 1.557 2.022z"/><path fill="#90603E" d="M20.659 30.132l-.212-.441s-.771 1.147-1.843 1.59c-.813.332-1.498.365-1.857.306.154.293.157.343.359.53 1.117.039 2.902-.56 3.553-1.985zm-2.217-.039c.99-.678 1.279-1.326 1.279-1.326l-.323-.409s-1.145 1.776-3.177 1.685c.015.248-.005.296.068.55.273.009 1.349.05 2.153-.5z"/><path fill="#60352A" d="M15.573 4.809c.576 1.385-.072 2.969-1.446 3.54-1.375.571-2.956-.086-3.531-1.472-.575-1.384.072-2.969 1.448-3.54 1.375-.571 2.956.087 3.529 1.472z"/><path fill="#AF7E57" d="M20.983 11.799c1.203-1.435 1.921-3.269 1.304-4.751l-1.02-2.457c-5.514 2.076-7.783-.773-7.783-.773s1.08 2.598-1.238 3.921l1.233 2.968c1.008 2.424 2.382 4.16 4.803 3.165l.082.326c.206.817.055 1.478 1.258 1.524.841.032 1.977-1.47 1.771-2.287l-.41-1.636z"/><path fill="#60352A" d="M27.41 5.412c.824-2.202-1.159-3.876-2.847-4.048-1.024-.104-1.948.549-2.398 1.331C20.114-.739 17.046.07 15.094.757c-2.068.728-5.144 2.869-3.937 5.17 1.207 2.302 5.238 1.312 5.238 1.312l1.459 2.352c-.394-2.024.95-2.476 1.571-2.035.654.465.22 1.956.518 2.544.298.588 1.33 1.394 1.33 1.394.634-.806 2.635-3.578 1.7-6.935.387-.145.968-.047 1.437.198 1.192.619.253 3.703 1.911 4.678 1.589.935 2.521-.351 2.521-.351-1.628.054-2.219-1.567-1.432-3.672z"/><path fill="#915A34" d="M14.342 11.782l-.308.128c-.135.056-.29-.006-.347-.143-.055-.135.008-.29.143-.346l.309-.128c.136-.057.291.008.347.143.056.135-.009.289-.144.346z"/><path fill="#60352A" d="M14.493 9.711c-.27.112-.58-.017-.692-.286l-.205-.491c-.112-.269.017-.581.287-.692.271-.113.582.017.693.285l.204.49c.113.271-.015.582-.287.694z"/><path fill="#DF1F32" d="M14.761 12.983c.243.295.509.541.796.733 1.055-.609 1.129-1.533 1.129-1.533l-1.875.779-.05.021z"/></svg>
\ No newline at end of file