Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f1e6-1f1eb.svg b/public/emoji/1f1e6-1f1eb.svg
index e1998a6b2..9e880f92e 100644
--- a/public/emoji/1f1e6-1f1eb.svg
+++ b/public/emoji/1f1e6-1f1eb.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" enable-background="new 0 0 64 64"><path d="m2 32c0 11.5 6.5 21.5 16 26.5v-53c-9.5 5-16 15-16 26.5" fill="#3e4347"/><path d="m62 32c0-11.5-6.5-21.5-16-26.5v53.1c9.5-5.1 16-15.1 16-26.6" fill="#699635"/><path d="M32,2c-5.1,0-9.8,1.3-14,3.5v53.1c4.2,2.2,8.9,3.5,14,3.5c5.1,0,9.8-1.3,14-3.5V5.5C41.8,3.3,37.1,2,32,2z" fill="#ed4c5c"/><g fill="#fff"><path d="m35.8 37h-1.1c0 .5-.1.9-.4 1.2h2.2c-.4-.3-.7-.8-.7-1.2"/><path d="m35.9 30.8l.6-.7h-2l-1-.7-3.1-.1-.9.8h-2l.6.7z"/><path d="m30.6 29.2h2.7c.4-.2.5-.9.5-1.2 0-1.1-.7-1.6-1.4-1.6-.1 0-.2-.1-.3-.2-.1-.2-.1-.4-.1-.4-.1 0 0 .1-.1.4 0 .1-.1.2-.3.2-.9 0-1.5.7-1.4 1.6 0 .6.1 1 .4 1.2"/><path d="m34.5 37.4l-.5-.3v-.6l-.3-.2v-.6l-.5-.2v-.5l-.4-.1v-.5l-.6-.2-.3-.2v-.4h-2v-.3c0-1 1.3-1.9 2.1-1.9 1 0 2.1.9 2.1 1.9v1h.1v-1c0-.9-1.1-2-2.1-2h3.6v-.1h-7.6v.1h3.6c-.6 0-2.1.7-2.1 2v3.6h.8v.7h-1c-.1 0-.2-.2-.2-.4h-1c0 .5-.3.9-.7 1.3h3v-.8h.8l.2.8h.7l-.3-.8h.7l.5.8h1l-.7-.8c0-.3 1.1-.3 1.1-.3m-4-1.3h.6l.1.7h-.7v-.7m1.4 1.3h-.6l-.1-.7h.5l-.2-.7h.1.1.1l.4.7h-.5l.2.7m.7 0l-.4-.7h.6l.6.7h-.8"/><path d="m34.1 34.7h.1v1h-.1z"/><path d="m28.3 35.8h1.1v-1.3h-1.1v.3l-2.2-3.8.1-.2c0-.2-.1-.3-.3-.3-.2 0-.3.1-.3.3s.1.3.3.3h.1l.1.1c-.2 0-.4.5-.9.9-.3.2-.5.9-.6 1.3 0 .1 0 .2 0 .3v.1c0 .2 0 .3 0 .5 0 .2-.2.6-.1.7.3.2.7.8.9 1 .1.1.3-.6.4-1.1v-.1c.1-.4.1-.9.4-1.2l.1-.1c.2-.2.6-.4.8-.6l1.3 2.3-.1.6"/><path d="m28.3 27.3h1v.2h-1z"/><path d="m28.3 27.7h1v2h-1z"/><path d="m28.8 26.2c-.2 0-.6.4-.5.8h1.1c0-.4-.4-.8-.6-.8"/><path d="m28.2 31.4h1.1v1.6h-1.1z"/><path d="m28.3 33.9h1.1v.3h-1.1z"/><path d="m28.2 36h1.2v.7h-1.2z"/><path d="m28.3 33.6h1l.2-.3h-1.3z"/><path d="m30.3 31.5h-.7v.9c.2-.4.4-.7.7-.9"/><path d="m39.5 33.8v-.1.1c0-.2 0-.3 0-.4 0-.4-.2-1-.6-1.3-.5-.4-.8-.9-.9-.9l.1-.1h.1c.2 0 .3-.1.3-.3s-.1-.3-.3-.3c-.2 0-.3.1-.3.3l.1.2-2.1 3.8v-.3h-1.1v1.3h1.1v-.7l1.3-2.3c.1.1.6.3.8.6l.1.1c.3.4.2.8.3 1.2v.1c.1.4.2 1.2.4 1.1.2-.2.6-.7.9-1 .1-.1-.1-.5-.1-.7-.2-.1-.1-.2-.1-.4"/><path d="m34.8 27.3h1v.2h-1z"/><path d="m34.8 27.7h1v2h-1z"/><path d="m35.8 27c0-.4-.3-.8-.5-.8-.2 0-.6.4-.5.8h1"/><path d="m34.7 31.4h1.1v1.6h-1.1z"/><path d="m34.7 33.9h1.1v.3h-1.1z"/><path d="m34.7 36h1.2v.7h-1.2z"/><path d="m34.5 33.3l.2.3h1l.2-.3z"/><path d="m34.4 32.4v-.9h-.7c.3.2.5.5.7.9"/><path d="m42.6 33.2c.4-.2.9-.5 1.2-.8.3-.5.2-1.4.2-1.4s-.7.3-1.3.6c0-.4-.2-.9-.4-1.3.3-.3.8-.7.9-1 .3-.6-.1-1.4-.1-1.4s-.6.4-1.1.9c-.1-.4-.4-.8-.7-1.2.2-.4.6-.9.6-1.2.1-.7-.5-1.4-.5-1.4s-.5.6-.8 1.2c-.3-.4-.8-.9-1.2-1.2.2-.3.2-.6.2-1 0-2.2-3.4-4-7.7-4-4.2 0-7.7 1.8-7.7 4 0 .3.1.7.2 1-.4.3-.9.7-1.2 1.2-.3-.6-.8-1.2-.8-1.2s-.6.7-.5 1.4c.1.4.4.9.6 1.2-.3.4-.6.8-.7 1.2-.4-.5-1.1-.9-1.1-.9s-.4.8-.1 1.4c.2.4.6.8.9 1-.2.4-.3.9-.4 1.3-.3-.3-1.1-.6-1.1-.6s-.2.9.2 1.4c.2.3.8.6 1.2.8-.1.4-.1 1 0 1.4-.6-.2-1.4-.3-1.4-.3s.1.9.6 1.3c.3.2.9.4 1.3.4.1.4.2 1 .4 1.3-.6-.1-1.4.1-1.4.1s.3.9.9 1.1c.4.1 1 .1 1.4.1.2.4.4.9.7 1.2-.6.1-1.3.4-1.3.4s.5.8 1.2.8c.4 0 1-.1 1.4-.3.3.4.6.7 1 1-.6.3-1.2.8-1.2.8s.7.6 1.4.5c.2 0 .3-.1.5-.2l-.9 1.2h12l-.8-.9c.2.1.3.1.5.2.7.1 1.4-.5 1.4-.5s-.6-.5-1.2-.8c.4-.2.7-.6 1-1 .4.2 1 .3 1.4.3.7-.1 1.2-.8 1.2-.8s-.7-.3-1.3-.4c.3-.3.5-.8.7-1.2.4 0 1 .1 1.4-.1.6-.3.9-1.1.9-1.1s-.8-.1-1.4-.1c.2-.4.3-.9.4-1.3.4-.1 1-.2 1.3-.4.5-.4.6-1.3.6-1.3s-.8.1-1.4.3c0-.7-.1-1.2-.1-1.7m-15.7 7.6c-.3-.2-.7-.4-1.1-.5.1-.3.3-.6.4-.9h.9c0 .3-.2.9-.2 1.4m8.9-.4c-.1.3-.1.7 0 1.1l-.6-.7h-6.5l-.6.7c.1-.4.1-.8 0-1.1-.1-.5-.6-.8-.9-.9h9.4c-.2.1-.6.4-.8.9m1.3.4c0-.5-.2-1.1-.2-1.4h.9c.1.3.3.7.4.9-.4.2-.8.3-1.1.5m4.1-6.4c-.5-.4-1.2-.9-1.2-.9s-.3.9 0 1.5c.2.4.8.8 1.1 1-.3.3-.5.6-.7.9-.3-.6-.9-1.2-.9-1.2s-.5.8-.4 1.4c.1.4.5.9.8 1.3-.3.2-.7.4-.9.7-.2-.6-.6-1.4-.6-1.4s-.7.6-.7 1.3c0 .1 0 .3.1.5l-1-.9h-9.5l-1 .9c0-.2.1-.3.1-.5 0-.7-.7-1.3-.7-1.3s-.4.7-.6 1.4c-.2-.3-.6-.5-.9-.7.3-.3.7-.8.8-1.3.2-.7-.4-1.4-.4-1.4s-.6.6-.9 1.2c-.2-.3-.4-.6-.7-.9.4-.2.9-.6 1.1-1 .3-.6 0-1.5 0-1.5s-.8.4-1.2.9c-.1-.3-.2-.7-.4-1 .4-.1 1-.4 1.3-.7.5-.5.4-1.4.4-1.4s-.8.2-1.4.5c0-.3 0-.7-.1-1.1.4 0 1.1-.1 1.5-.3.6-.4.7-1.3.7-1.3s-.9 0-1.5.2c.1-.3.1-.7.2-1.1.4.1 1.1.2 1.5.1.7-.2 1-1 1-1s-.8-.2-1.5-.2c.5-.8.7-2.3.7-2.3s-.1 0-.2.1c1.2-1.4 3.9-2.4 7-2.4s5.8 1 7 2.4c-.1-.1-.2-.1-.2-.1s.2 1.5.7 2.3c-.7 0-1.5.2-1.5.2s.4.8 1 1c.4.1 1.1 0 1.5-.1 0 .4 0 .8.2 1.1-.6-.2-1.5-.2-1.5-.2s.2.9.7 1.3c.4.2 1 .3 1.5.3-.1.4-.2.8-.1 1.1-.6-.3-1.4-.5-1.4-.5s-.1.9.4 1.4c.3.3.9.5 1.3.7-.2.3-.4.6-.5 1"/></g></svg>
\ No newline at end of file
+<?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(36,9)" id="g20"><path id="path22" style="fill:#141414;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -28,0 c -2.209,0 -4,1.791 -4,4 l 0,18 c 0,2.209 1.791,4 4,4 l 28,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(32,31)" id="g24"><path id="path26" style="fill:#019900;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2.209,0 4,-1.791 4,-4 l 0,-18 c 0,-2.209 -1.791,-4 -4,-4 l -8,0 0,26 8,0 z"/></g><path id="path28" style="fill:#bf1700;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 24,5 12,5 12,31 24,31 24,5 Z"/><g transform="translate(21.7666,21.9702)" id="g30"><path id="path32" style="fill:#ff8b88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.149,-1.341 c 0.677,-0.673 1.097,-1.604 1.097,-2.634 0,-2.052 -1.663,-3.715 -3.715,-3.715 -2.051,0 -3.714,1.663 -3.714,3.715 0,1.03 0.42,1.961 1.097,2.634 L -7.534,0 c -1.053,-0.999 -1.714,-2.408 -1.714,-3.975 0,-3.027 2.454,-5.481 5.481,-5.481 3.028,0 5.482,2.454 5.482,5.481 C 1.715,-2.408 1.054,-0.999 0,0"/></g><g transform="translate(17.9731,23.5996)" id="g34"><path id="path36" style="fill:#ff5b57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.906,0 3.489,-1.176 3.489,-1.176 L 2.715,-2.019 c 0,0 -1.282,0.796 -2.688,0.796 -1.406,0 -2.688,-0.972 -2.688,-0.972 l -0.683,0.871 C -3.344,-1.324 -1.956,0 0,0"/></g><g transform="translate(18.8403,20.126)" id="g38"><path id="path40" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.464 -0.376,-0.84 -0.84,-0.84 -0.465,0 -0.841,0.376 -0.841,0.84 0,0.464 0.376,0.84 0.841,0.84 C -0.376,0.84 0,0.464 0,0"/></g><g transform="translate(19.0898,19.2886)" id="g42"><path id="path44" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.422,0.454 -0.668,0 -0.671,0 L -2.183,0 l -0.926,-0.115 0.288,-0.431 1.731,0 1.729,0 0.288,0.431 L 0,0 Z"/></g><g transform="translate(16.749,19.3672)" id="g46"><path id="path48" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.116 -0.094,-0.21 -0.21,-0.21 -0.116,0 -0.209,0.094 -0.209,0.21 l 0,1.434 c 0,0.115 0.093,0.209 0.209,0.209 C -0.094,1.643 0,1.549 0,1.434 L 0,0 Z"/></g><path id="path50" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16.721,18.145 -0.446,0 0,0.658 0.446,0 0,-0.658 z"/><path id="path52" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16.721,17.145 -0.446,0 0,0.658 0.446,0 0,-0.658 z"/><path id="path54" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16.721,15.941 -0.446,0 0,0.861 0.446,0 0,-0.861 z"/><g transform="translate(16.0444,15.9287)" id="g56"><path id="path58" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 1.297,0 0,0.34 -0.982,0 L 0,0 Z"/></g><g transform="translate(19.2715,19.3672)" id="g60"><path id="path62" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.116 0.094,-0.21 0.21,-0.21 0.115,0 0.209,0.094 0.209,0.21 l 0,1.434 C 0.419,1.549 0.325,1.643 0.21,1.643 0.094,1.643 0,1.549 0,1.434 L 0,0 Z"/></g><path id="path64" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 19.3,18.145 0.446,0 0,0.658 -0.446,0 0,-0.658 z"/><path id="path66" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 19.3,17.145 0.446,0 0,0.658 -0.446,0 0,-0.658 z"/><path id="path68" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 19.3,15.941 0.446,0 0,0.861 -0.446,0 0,-0.861 z"/><g transform="translate(19.9756,15.9287)" id="g70"><path id="path72" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.297,0 0,0.34 0.983,0 L 0,0 Z"/></g><g transform="translate(17.0278,17.9097)" id="g74"><path id="path76" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.878,-0.047 2.035,-1.65 1.651,-1.641 1.109,-1.371 -0.045,-1.359 0,0 Z"/></g><g transform="translate(12.4033,17.7705)" id="g78"><path id="path80" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.015,0.064 0.481,-0.45 0.875,-0.466 0.394,-0.015 1.152,-0.031 1.257,-0.344 0.105,-0.312 0.192,-0.632 0.192,-0.632 0,0 -0.232,0.191 -0.566,0.248 -0.333,0.056 -1.029,0.203 -1.291,0.34 C 0.206,-0.716 0.06,-0.253 0,0"/></g><g transform="translate(13.3296,14.8955)" id="g82"><path id="path84" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.454,-0.067 0.882,0.132 0.429,0.199 1.297,0.553 1.832,-0.171 0,0 -0.431,0.145 -0.808,-0.078 C 1.53,-0.341 0.963,-0.583 0.536,-0.478 0.108,-0.372 0,0 0,0"/></g><g transform="translate(13.1187,19.126)" id="g86"><path id="path88" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.053,0.116 0.27,-0.026 0.357,0.053 0.444,0.132 0.345,0.412 0.473,0.444 0.6,0.476 0.93,-0.178 1.093,-0.593 1.256,-1.009 1.144,-1.526 0.997,-1.635 c -0.147,-0.108 -0.037,0 -0.037,0 0,0 -0.041,0.425 -0.271,0.682 C 0.459,-0.696 0,0 0,0"/></g><g transform="translate(23.5928,17.7705)" id="g90"><path id="path92" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.015,0.064 -0.482,-0.45 -0.875,-0.466 -0.394,-0.015 -1.152,-0.031 -1.257,-0.344 -0.105,-0.312 -0.192,-0.632 -0.192,-0.632 0,0 0.232,0.191 0.565,0.248 0.334,0.056 1.03,0.203 1.291,0.34 C -0.206,-0.716 -0.06,-0.253 0,0"/></g><g transform="translate(22.6904,14.8955)" id="g94"><path id="path96" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.453,-0.067 -0.882,0.132 -0.429,0.199 -1.297,0.553 -1.831,-0.171 0,0 0.431,0.145 0.807,-0.078 0.377,-0.224 0.943,-0.466 1.371,-0.361 C -0.107,-0.372 0,0 0,0"/></g><g transform="translate(22.877,19.126)" id="g98"><path id="path100" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.053,0.116 -0.27,-0.026 -0.356,0.053 -0.087,0.079 0.011,0.359 -0.117,0.391 -0.127,0.032 -0.457,-0.622 -0.62,-1.037 -0.163,-0.416 -0.051,-0.933 0.097,-1.042 0.146,-0.108 0.037,0 0.037,0 0,0 0.04,0.425 0.27,0.682 C -0.459,-0.696 0,0 0,0"/></g><g transform="translate(15.8594,15.3564)" id="g102"><path id="path104" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.005,0.386 4.146,0 L 4.157,-0.009 0,0 Z"/></g><g transform="translate(14.8892,18.3672)" id="g106"><path id="path108" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.481,0.483 1.538,-1.062 1.445,-1.115 0.661,-0.13 0.463,-0.402 0,0 Z"/></g><g transform="translate(21.1162,18.3672)" id="g110"><path id="path112" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.482,0.483 -1.057,-1.545 0.094,-0.053 0.784,0.985 0.197,-0.272 L 0,0 Z"/></g><g transform="translate(20.9912,13.1348)" id="g114"><path id="path116" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.054,0.17 -0.767,0.764 -1.042,0.889 -1.317,1.014 -1.815,0.699 -2.152,0.638 -2.49,0.576 -2.991,0.607 -2.991,0.607 c 0,0 -0.36,-0.031 -0.697,0.031 C -4.025,0.699 -4.382,1.014 -4.657,0.889 -4.933,0.764 -5.757,0.17 -5.703,0 c 0.054,-0.17 0.792,-0.412 0.792,-0.412 l -0.036,-0.288 1.201,-0.034 0.177,0.224 0.578,0.117 0.722,-0.117 0.248,-0.224 1.238,0.034 -0.018,0.288 c 0,0 0.747,0.242 0.801,0.412"/></g></g></g></g></svg>