Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f1f1-1f1f0.svg b/public/emoji/1f1f1-1f1f0.svg
index 5eb3cd7ee..18ce60f46 100644
--- a/public/emoji/1f1f1-1f1f0.svg
+++ b/public/emoji/1f1f1-1f1f0.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="M29.2,8H50c-5-3.8-11.2-6-18-6c-6.8,0-13,2.2-18,6h11.6v48H14c5,3.8,11.2,6,18,6c6.8,0,13-2.2,18-6H29.2V8z" fill="#ffce31"/><path d="m62 32c0-9.8-4.7-18.5-12-24h-20.8v48h20.8c7.3-5.5 12-14.2 12-24" fill="#c94747"/><path d="m25.6 8h-11.6c-.1.1-.3.2-.4.3v47.4c.1.1.3.2.4.3h11.6v-48" fill="#ff8736"/><path d="M2,32c0,9.6,4.5,18.2,11.6,23.7V8.3C6.5,13.8,2,22.4,2,32z" fill="#699635"/><g fill="#ffce31"><path d="m34.4 49.6c-1.1.8-3.2.7-4.1 1.7-1.1 1.1.1 2.5.1 2.7l-.1.8c0 0 .7 0 1.1.1.5.1.7.5 1.5.4 2.2-.1 2.1-2.1 2.2-3.8.1-.6.4-1.5.5-2.1.1-.6.2-1.4.2-1.4 0-.3-.7 1.1-1.4 1.6"/><path d="m35.1 12.7c-.1-1.7 0-3.7-2.2-3.8-.9-.1-1.1.3-1.5.4-.3 0-1.1.1-1.1.1l.1.8c0 .1-1.2 1.6-.1 2.7.9.9 3.1.9 4.1 1.7.7.5 1.4 1.8 1.4 1.8 0 0 0-.9-.2-1.4-.1-.8-.4-1.7-.5-2.3"/><path d="m61.8 28.7c-.8 0-1.5-.1-2.2-.1.3.2-.8-3.5-.2-4 .7-.6.2-4.2-.4-5 0-.1 0-.3.1-.4-.3-.7-.7-1.4-1.1-2-1.1-.4-2-1.1-2.4.5-.4-.5-1.5-1.6-2.2-1.3-.1.4-.2.8-.4 1.2-.5.2-2.3-.8-3.3-.6 0 2-1.2 1.2-2.6 1.9-2.6 1.2-1.3-1.1-3-1.1-3.2 0 1.3 4.9 2.1 5.4.1-.2-.3-.6 0-.8 0 0 1.1.9 1.1.6.1-.3.1-.6.3-.8.3.5 2.6 3.2 2.1 3.7-.1.1-2.3-.1-2.3-.1.1-.2.2-.7.2-.8-.7-.7-2-.8-2.7-.6-.6.2-1.7 1-1.8 2 .4-.1 1.8-.5 2-.3.1.1-.4.8-.4.9.6 0 1.8.3 2.1.3.1-.2.3-.5.4-.7.3.4.5.8.8 1.3.3.2.9-1.8 1.5-.4.2.5-4.9 5.3-5.2 7.1-.2 1 0 2 .4 2.9-.9-1-3.3-3.7-3.9-3.4-1.5.8-.2 5.4.5 6.3.8 1.1 5.5 3.8 5.5.2 0-.2-.2-.5-.4-.9 1.1.7 2.5 1.3 3.1 2 .7.8 1.3 3 1.2 4.2-.3 2.9-4.8.2-4.8 3.4 0-.4 4.4.2 4.7-.1.7-.5 2.9 1.2 2.5-1.2-.4-2.4 2.5-1.3 2.5-3.2 0-1-3.1.2-1.4-2.5.7-1 .2-2.4 1-1.3 1.3 1.6 3.4.5 5.7-.7.7-2.6 1.1-5.3 1.1-8.1 0-1.3-.1-2.4-.2-3.5"/><path d="m40 41.8c-.2.7-1.2-3.1-1-3.3.4.1.7.1 1.1.1.3-.2-.7-.7-1.6-1 .8 0 1.5-.3 1.5-.5 0-.2-.4-.4-1.1-.5.6-.1 1-.3 1-.5 0-.2-.5-.4-1.2-.5.7-.1 1.3-.3 1.3-.5 0-.2-.3-.4-.8-.5.6-.1 1-.3 1-.6 0-.2-.3-.4-.8-.5.5-.1.9-.2 1.2-.3 1.7-1.8-.5-3-.5-1.1 0 .8-2.2.5-2.6.3-.4-.2-.2-.4 0-.7.4.2 2.2.5 2.3-2.1.1-1.1.1-16.3 1.5-16.3-5.9-.3-3.3 14.6-3.8 17.9-.4-.7-2.1.1-1.6 1.2.3.6 1 .9 1.7 1.1-.5.1-.9.3-.9.5 0 .2.3.4.8.5-.6.1-1 .3-1 .5 0 .2.5.4 1.2.5-.7.1-1.3.3-1.3.5 0 .2.5.4 1.1.5-.6.1-1 .3-1 .5 0 .2.3.4.8.5-.4.1-.6.3-.6.6.4.2.8.4 1.2.6 0 .8-.4 2.5-.7 3.3-.1-.3-.4-.4-.6-.5-1.3.1 1 1.6 1 1.5 0 .5-.5.4-.7.7 0 0 1.6 1 1.6 1.2.2-.2 1.5-1.1 1.6-1.2-.2-.2-.7-.4-.7-.7 0-.2 1.3-.5 1.4-.9.1-.4-.7-.8-.8-.3"/></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><clipPath id="clipPath32" clipPathUnits="userSpaceOnUse"><path id="path34" d="M 4,30 C 2.345,30 1,28.654 1,27 L 1,27 1,9 C 1,7.346 2.345,6 4,6 l 0,0 28,0 c 1.655,0 3,1.346 3,3 l 0,0 0,18 c 0,1.654 -1.345,3 -3,3 l 0,0 -28,0 z"/></clipPath><clipPath id="clipPath44" clipPathUnits="userSpaceOnUse"><path id="path46" 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:#ffb700;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(4,6)" id="g24"><path id="path26" style="fill:#8d2129;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.654,0 -3,1.346 -3,3 l 0,18 c 0,1.654 1.346,3 3,3 l 28,0 c 1.654,0 3,-1.346 3,-3 L 31,3 C 31,1.346 29.654,0 28,0 L 0,0 Z"/></g></g></g><g id="g28"><g clip-path="url(#clipPath32)" id="g30"><path id="path36" style="fill:#005641;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 5,6 1,6 1,30 5,30 5,6 Z"/><path id="path38" style="fill:#ff5b00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 9,6 5,6 5,30 9,30 9,6 Z"/></g></g><g id="g40"><g clip-path="url(#clipPath44)" id="g42"><path id="path48" style="fill:#ffb700;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 10,5 9,5 9,31 10,31 10,5 Z"/><g transform="translate(13.1992,25.938)" id="g50"><path id="path52" style="fill:#ffb700;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.067,0.959 -0.035,1.762 0.021,0.532 -0.277,1.175 -0.84,1.082 -0.562,-0.094 -1.188,0.02 -1.188,0.02 0,0 0.126,-0.364 0,-0.708 C -2.188,1.812 -2.188,1.094 -1.344,1 -0.5,0.906 -0.156,0.469 0,0"/></g><g transform="translate(31.8828,25.938)" id="g54"><path id="path56" style="fill:#ffb700;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.067,0.959 0.035,1.762 -0.021,0.532 0.277,1.175 0.84,1.082 0.562,-0.094 1.188,0.02 1.188,0.02 0,0 -0.126,-0.364 0,-0.708 C 2.188,1.812 2.188,1.094 1.344,1 0.5,0.906 0.156,0.469 0,0"/></g><g transform="translate(13.1992,10.0625)" id="g58"><path id="path60" style="fill:#ffb700;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.067,-0.96 -0.035,-1.763 0.021,-0.532 -0.277,-1.175 -0.84,-1.081 -0.562,0.094 -1.188,-0.021 -1.188,-0.021 0,0 0.126,0.365 0,0.709 -0.125,0.344 -0.125,1.062 0.719,1.156 0.844,0.094 1.188,0.531 1.344,1"/></g><g transform="translate(31.8828,10.0625)" id="g62"><path id="path64" style="fill:#ffb700;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.067,-0.96 0.035,-1.763 -0.021,-0.532 0.277,-1.175 0.84,-1.081 0.562,0.094 1.188,-0.021 1.188,-0.021 0,0 -0.126,0.365 0,0.709 C 2.188,-1.812 2.188,-1.094 1.344,-1 0.5,-0.906 0.156,-0.469 0,0"/></g><g transform="translate(18.4063,22.625)" id="g66"><path id="path68" style="fill:#ffb700;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.594,0.031 1.187,0.187 0.594,0.157 0.407,0.719 0.407,0.719 0,0 0.531,0.281 0.844,0 C 2.75,0.625 3.125,0.656 2.938,1.031 3.5,1.312 3.75,0.687 3.75,0.687 c 0,0 0.281,0.177 0.344,0.417 C 4.594,1.156 4.687,0.656 5,0.719 5.312,0.781 5.531,1.108 5.531,1.108 5.531,1.108 5.594,0.219 5.062,0 5.5,-0.562 5.375,-1.656 5.375,-1.937 L 5.062,-1.75 c 0,0 0.188,-0.875 0.282,-1 0.093,-0.125 -0.313,0 -0.313,0 0,0 0.219,-0.594 0.375,-0.688 0.156,-0.093 3.094,0.188 3.938,0.188 0.844,0 2,0.125 2,0.875 0,0.75 -0.969,0.688 -2.063,0.531 C 8.188,-2 7.469,-1.969 7.031,-1.687 6.594,-1.406 6.095,-1.333 6.136,-2.042 c -0.667,0.313 -0.188,0.98 -0.188,0.98 0,0 -0.761,0.833 -0.276,1.666 0.484,0.833 2.359,1.084 3.672,0.354 1.312,-0.729 1.833,-1.332 2.375,-1.437 -0.021,0.396 0.646,0.687 0.729,-0.042 0.083,-0.729 -0.834,-0.583 -1.229,-0.354 -0.396,0.229 -1.105,0.917 -1.105,0.917 0,0 -0.021,-0.418 0.25,-0.688 C 9.614,-0.562 9.448,0 9.448,0 9.448,0 9.406,-0.604 8.719,-0.625 9.219,-0.042 9.052,0.437 8.364,0.687 8.761,0.083 8.385,-0.438 7.802,-0.521 8.198,0.042 7.865,0.687 7.136,0.812 7.239,0.354 6.886,0.229 6.886,0.229 c 0,0 -0.166,0.417 -0.5,0.188 -0.334,-0.23 -0.417,-0.729 0.02,-1.042 0.271,0.542 0.813,0.501 1,0.271 -0.562,-0.063 -0.541,-0.584 -0.333,-0.854 0.208,0.354 0.417,0.458 0.625,0.083 0.208,-0.375 0.833,-0.354 1.958,-0.187 1.125,0.166 2.161,0.044 2.333,-0.959 0.147,-0.854 -0.708,-1.271 -0.708,-1.271 0,0 1.104,-0.833 0.396,-2.645 C 10.969,-8 11.261,-8.75 11.531,-8.938 c 0.271,-0.187 0.688,-0.207 0.125,-0.707 -0.562,-0.5 -0.417,-0.856 -0.187,-1.147 0.229,-0.291 0.167,-0.583 -0.5,-0.208 -0.292,-0.292 -0.583,-0.208 -0.75,0.042 -0.167,-0.23 -0.48,-0.292 -0.688,-0.042 -0.208,-0.167 -0.478,-0.167 -0.333,0.187 0.146,0.355 0.855,0.5 1.063,0.563 0.208,0.062 0.187,0.439 0.125,0.855 -0.063,0.416 -0.417,0.854 -1.167,1.25 C 8.886,-8.395 8.927,-8.686 9.052,-8.833 9.177,-8.979 9.573,-9.02 9.594,-9.145 9.614,-9.27 9.386,-9.542 9.136,-9.729 c -0.25,-0.188 -0.208,-0.522 -0.125,-0.688 0.083,-0.166 0.186,-0.577 -0.084,-0.768 -0.271,-0.19 -0.541,0.247 -0.541,0.247 0,0 -0.168,-0.52 -0.647,-0.02 -0.27,-0.334 -0.541,-0.209 -0.666,-0.021 -0.271,-0.271 -0.687,-0.25 -0.479,0.125 0.208,0.375 0.458,0.375 0.75,0.396 0.292,0.02 0.686,0.082 0.645,0.666 -0.041,0.584 -0.156,1.177 -0.562,1.542 -0.625,0.563 -0.521,1.23 -0.521,1.23 0,0 -1.042,0.103 -1.854,-0.459 -0.813,-0.563 -1.438,-0.563 -1.438,-0.563 0,0 -0.459,-0.5 -0.5,-0.812 -0.041,-0.313 0.147,-0.417 0.397,-0.5 0.25,-0.084 0.437,-0.063 0.062,-0.396 -0.375,-0.333 -0.687,-0.313 -0.687,-0.313 0,0 -0.022,-0.354 0.02,-0.562 0.042,-0.208 -0.084,-0.569 -0.292,-0.607 C 2.406,-11.27 2.094,-11 2.094,-11 c 0,0 -0.396,-0.417 -0.708,0.021 -0.355,-0.334 -0.667,-0.21 -0.792,0 -0.209,-0.334 -0.542,-0.188 -0.334,0.187 0.209,0.375 0.501,0.418 1.001,0.397 0.5,-0.022 0.916,0.375 0.728,0.895 -0.187,0.521 -0.353,1.23 -0.353,1.23 0,0 -0.396,0.041 -0.98,0.375 -0.729,-0.875 -0.979,-0.564 -1.187,-0.397 -0.209,0.167 -0.709,0.625 -0.709,0.625 0,0 -0.27,0.022 -0.229,-0.228 -0.291,0.02 -0.187,0.478 -0.187,0.708 0,0.229 -0.084,0.5 -0.25,0.5 -0.167,0 -0.417,-0.042 -0.417,-0.042 0,0 0,-0.082 0.25,-0.166 0.25,-0.084 0.229,-0.251 -0.021,-0.272 -0.25,-0.02 -0.416,-0.082 -0.229,-0.228 0.188,-0.147 0.209,-0.229 0.063,-0.375 -0.146,-0.147 -0.125,-0.541 0.125,-0.688 0.166,0.395 0.479,0.166 0.416,-0.105 -0.062,-0.27 -0.521,-0.229 -0.521,-0.229 l 0.313,-0.353 -0.476,-0.105 c 0,0 -0.024,-0.292 -0.212,-0.354 -0.187,-0.063 -0.229,0.437 -0.229,0.437 l -0.437,0.022 0.291,0.353 c 0,0 -0.417,0.147 -0.437,0.397 -0.021,0.25 0.312,0.125 0.375,0 0.333,0.145 0.229,0.478 0.104,0.603 -0.125,0.125 -0.042,0.228 0.083,0.375 0.125,0.147 0.105,0.228 -0.083,0.188 -0.187,-0.041 -0.5,0.334 -0.187,0.334 0.312,0 0.374,0.021 0.333,0.25 -0.375,0.041 -0.146,0.333 -0.146,0.333 0,0 -0.292,0.208 -0.083,0.354 -0.188,0.166 -0.23,0.438 -0.021,0.479 -0.125,0.104 0.042,0.292 0.042,0.292 0,0 -0.605,0.104 -0.605,0.562 0,0.458 0.521,0.375 0.521,0.375 0,0 -0.062,1.458 0.084,3.5 0.145,2.042 0.999,2.751 1.52,2.958 -0.541,-1.146 -0.479,-3.083 -0.479,-4.271 0,-1.187 -0.021,-2.124 -0.021,-2.124 0,0 0.584,-0.042 0.542,-0.438 C -1.49,-5.021 -1.76,-5.104 -1.76,-5.104 l 1.354,-1.354 c 0,0 -0.062,1.389 0.396,1.944 0.458,0.556 1.165,1.076 1.374,1.243 0.209,0.167 -0.129,0.609 -0.291,0.125 -0.236,0.029 -0.437,0.417 -0.437,0.417 0,0 0.02,-0.145 -0.126,-0.25 -0.145,-0.104 -0.104,0.355 -0.187,0.312 -0.083,-0.041 -0.313,-0.166 -0.604,-0.25 0.021,0.167 0.146,0.375 0.146,0.375 0,0 -0.375,-0.041 -0.709,-0.083 0,0.292 0.187,0.771 0.354,0.813 -0.416,0.208 -0.312,0.604 -0.125,0.541 0.188,-0.062 1.062,-0.583 2.042,-0.646 -0.313,0.355 -0.563,0.813 -0.563,0.813 L 0.761,-1.458 0.385,-1.104 0.344,-1.458 c 0,0 -0.917,0.666 -1.084,1.208 -0.166,0.542 0.021,0.939 0.334,0.896 C 0.198,0.562 0,0 0,0"/></g></g></g></g></svg>