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/1f1ff-1f1f2.svg b/public/emoji/1f1ff-1f1f2.svg
index 25e86be03..d27689638 100644
--- a/public/emoji/1f1ff-1f1f2.svg
+++ b/public/emoji/1f1ff-1f1f2.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><clipPath id="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="M 4,31 C 1.791,31 0,29.209 0,27 L 0,27 0,9 C 0,6.791 1.791,5 4,5 l 0,0 28,0 c 2.209,0 4,1.791 4,4 l 0,0 0,18 c 0,2.209 -1.791,4 -4,4 l 0,0 -28,0 z"/></clipPath><clipPath id="clipPath42" clipPathUnits="userSpaceOnUse"><path id="path44" 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:#1a8a00;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></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><path id="path32" style="fill:#ef7d00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 31,21 5,0 0,-16 -5,0 0,16 z"/><path id="path34" style="fill:#141414;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26,21 5,0 0,-16 -5,0 0,16 z"/><path id="path36" style="fill:#de200f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 21,21 5,0 0,-16 -5,0 0,16 z"/></g></g><g id="g38"><g clip-path="url(#clipPath42)" id="g40"><g transform="translate(28.6475,24.0166)" id="g46"><path id="path48" style="fill:#ef7d00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.28,0 -0.088,0.151 -0.132,0.303 -0.044,0.152 0.152,0.022 0.13,0.152 -0.023,0.13 0,0.758 0,0.758 C 0.215,0.997 0.323,0.715 0.302,0.498 0.28,0.281 0.41,0.26 0.453,0.151 0.496,0.042 0.28,0 0,0 M 6.436,3.728 C 6.326,3.749 5.72,3.402 5.72,3.402 c 0,0 0.564,0.65 0.433,0.65 -0.13,0 -0.866,-0.346 -0.866,-0.346 0,0 0.455,0.564 0.303,0.498 C 5.437,4.139 4.614,3.771 3.986,3.508 4.074,3.657 4.052,3.879 3.986,3.879 3.922,3.879 3.553,3.641 2.989,3.511 2.425,3.381 1.581,2.904 1.212,2.969 c -0.368,0.065 -1.106,0 -1.106,0 0,0 -0.215,0.325 -0.043,0.412 0.172,0.087 0.304,-0.13 0.304,-0.13 0,0 0.304,0.13 0.304,0.314 0,0.184 -0.521,0.206 -0.521,0.206 0,0 -0.217,0.281 -0.563,0.281 -0.91,0 -0.976,-0.975 -0.976,-0.975 0,0 -0.369,0.13 -0.715,0.217 -0.346,0.087 -0.954,0.043 -1.56,0.412 -0.607,0.369 -0.997,0.498 -0.261,-0.282 -1.084,0.368 -1.646,1.105 -1.799,0.785 -0.152,-0.32 0.412,-0.698 0.412,-0.698 0,0 -0.303,0.086 -0.563,0.325 -0.26,0.239 -0.629,0.39 -0.281,-0.13 -0.455,0.13 -0.13,-0.347 -0.13,-0.347 0,0 -0.369,-0.108 0,-0.368 0.368,-0.261 1.04,-0.369 1.04,-0.369 0,0 -0.304,-0.216 -0.109,-0.303 0.195,-0.087 0.52,-0.022 0.52,-0.022 0,0 -0.26,-0.216 0,-0.303 0.26,-0.087 0.585,0 0.585,0 0,0 -0.108,-0.217 0.151,-0.315 0.261,-0.098 0.673,0.119 0.673,0.119 0,0 -0.195,-0.129 0,-0.238 0.196,-0.108 0.498,0.119 0.498,0.119 0,0 -0.173,-0.292 0,-0.336 0.173,-0.043 0.455,0.174 0.455,0.174 0,0 -0.173,-0.282 0,-0.304 0.173,-0.022 0.564,0.195 0.564,0.195 0,0 -0.239,-0.303 0,-0.303 0.239,0 0.52,0.151 0.52,0.151 0,0 -0.065,-0.238 0.13,-0.324 0.195,-0.087 0.477,0.151 0.477,0.151 0,0 0.065,-0.455 0.022,-0.715 -0.043,-0.26 0.281,-0.065 0.281,-0.065 0,0 -0.044,-0.39 -0.303,-0.368 -0.26,0.021 -0.521,-0.325 -0.433,-0.412 0.087,-0.087 0.433,0.065 0.433,0.065 0,0 -0.022,-0.477 0.108,-0.437 0.13,0.04 0.347,0.307 0.347,0.307 0,0 0.13,-0.347 0.218,-0.304 0.086,0.044 0.129,0.239 0.129,0.347 0,0.108 0.238,0.152 0.238,0.152 0,0 0.065,-0.433 0.152,-0.349 0.088,0.084 0.108,0.371 0.238,0.457 0.13,0.086 0.087,-0.498 0.217,-0.455 0.131,0.043 0.066,0.434 0.022,0.564 -0.043,0.13 0.26,-0.109 0.239,0 -0.022,0.109 -0.261,0.325 -0.261,0.325 0,0 0.303,-0.109 0.217,0 -0.086,0.109 -0.13,0.39 0,0.328 0.13,-0.061 0.239,0.192 0.239,0.192 0,0 0.346,-0.26 0.563,-0.173 0.216,0.085 -0.282,0.39 -0.282,0.39 0,0 0.759,-0.261 0.926,-0.217 0.168,0.044 -0.255,0.325 -0.255,0.325 0,0 0.478,-0.108 0.565,0 0.086,0.109 -0.31,0.195 -0.31,0.195 0,0 0.526,-0.087 0.591,0 0.065,0.087 -0.151,0.195 -0.151,0.195 0,0 0.866,0.022 1.04,0.325 C 4.875,1.734 5.828,2.427 5.915,2.579 6.001,2.73 5.764,2.73 5.764,2.73 c 0,0 0.52,0.412 0.455,0.477 C 6.153,3.272 5.872,3.121 5.872,3.121 c 0,0 0.672,0.585 0.564,0.607"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#1A8A00" d="M32 5H4C1.791 5 0 6.791 0 9v18c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4V9c0-2.209-1.791-4-4-4z"/><path fill="#EF7D00" d="M31 31h1c2.209 0 4-1.791 4-4V15h-5v16z"/><path fill="#141414" d="M26 15h5v16h-5z"/><path fill="#DE200F" d="M21 15h5v16h-5z"/><path fill="#EF7D00" d="M35.083 8.256c-.109-.021-.716.325-.716.325s.564-.65.434-.65c-.13 0-.866.346-.866.346s.455-.563.303-.498c-.152.065-.976.433-1.604.696.088-.149.065-.372 0-.372-.064 0-.434.238-.997.369-.564.13-1.408.607-1.777.542-.368-.065-1.105 0-1.105 0s-.216-.325-.043-.412c.172-.087.304.13.304.13s.304-.13.304-.314-.521-.206-.521-.206-.218-.281-.563-.281c-.91 0-.976.975-.976.975s-.369-.13-.715-.217c-.347-.087-.954-.043-1.56-.412-.606-.369-.997-.498-.261.282-1.084-.369-1.646-1.105-1.799-.786-.152.32.412.699.412.699s-.304-.086-.563-.325c-.26-.239-.629-.39-.281.13-.455-.13-.13.347-.13.347s-.369.108 0 .368c.368.26 1.04.369 1.04.369s-.304.216-.109.303.521.022.521.022-.26.216 0 .303.585 0 .585 0-.108.217.151.314c.261.098.673-.119.673-.119s-.195.13 0 .238c.195.108.498-.119.498-.119s-.173.292 0 .336c.173.043.455-.173.455-.173s-.173.281 0 .303c.173.022.563-.195.563-.195s-.238.303 0 .303c.239 0 .521-.151.521-.151s-.065.238.13.325c.195.087.476-.152.476-.152s.066.456.022.715c-.043.26.281.065.281.065s-.044.39-.304.369c-.26-.022-.521.325-.433.412.087.087.433-.065.433-.065s-.021.477.108.437c.13-.04.347-.307.347-.307s.13.347.218.304c.087-.044.13-.238.13-.347s.237-.152.237-.152.065.433.152.349c.088-.085.108-.371.238-.457.13-.086.087.498.217.455.131-.043.065-.434.022-.564-.043-.13.261.108.239 0-.021-.109-.261-.325-.261-.325s.303.109.217 0-.13-.39 0-.329.239-.191.239-.191.346.26.562.173c.216-.086-.281-.39-.281-.39s.759.26.926.217c.168-.044-.255-.325-.255-.325s.477.108.564 0c.086-.109-.31-.195-.31-.195s.525.087.591 0c.065-.087-.151-.195-.151-.195s.866-.021 1.04-.325c.867.022 1.82-.671 1.907-.823.086-.152-.151-.152-.151-.152s.521-.412.455-.477c-.065-.065-.347.086-.347.086s.672-.585.564-.606zm-6.436 3.727c-.28 0-.088-.151-.132-.303-.044-.152.152-.021.13-.152-.023-.13 0-.758 0-.758.217.217.325.499.304.715-.021.217.108.238.151.347.044.109-.172.151-.453.151z"/></svg>
\ No newline at end of file