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/269b.svg b/public/emoji/269b.svg
index 67f33674f..385c18ced 100644
--- a/public/emoji/269b.svg
+++ b/public/emoji/269b.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(36,4)" id="g20"><path id="path22" style="fill:#9266cc;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,28 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(28.5361,12)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.156,-0.275 -0.729,-0.439 -1.53,-0.439 -1.195,0 -2.758,0.338 -4.504,0.94 0.123,0.879 0.217,1.79 0.279,2.72 0.808,0.534 1.58,1.088 2.307,1.652 C -0.724,2.525 0.347,0.608 0,0 m -10.536,-6.125 c -0.706,0 -1.855,1.908 -2.546,5.494 0.83,0.33 1.683,0.713 2.546,1.133 0.863,-0.42 1.716,-0.803 2.546,-1.133 -0.691,-3.586 -1.84,-5.494 -2.546,-5.494 m -9.006,5.686 c -0.802,0 -1.374,0.164 -1.53,0.438 -0.347,0.609 0.723,2.526 3.448,4.874 0.727,-0.564 1.499,-1.118 2.307,-1.652 0.061,-0.93 0.156,-1.841 0.279,-2.72 -1.746,-0.602 -3.31,-0.94 -4.504,-0.94 M -21.072,12 c 0.156,0.275 0.728,0.439 1.53,0.439 1.194,0 2.758,-0.338 4.504,-0.94 -0.123,-0.879 -0.218,-1.79 -0.279,-2.72 -0.808,-0.534 -1.58,-1.088 -2.307,-1.652 -2.725,2.348 -3.795,4.265 -3.448,4.873 m 10.536,6.125 c 0.706,0 1.855,-1.908 2.546,-5.494 -0.83,-0.33 -1.683,-0.713 -2.546,-1.133 -0.863,0.42 -1.716,0.803 -2.546,1.133 0.691,3.586 1.84,5.494 2.546,5.494 M -5.67,6.608 C -5.382,6.403 -5.11,6.201 -4.844,6 -5.11,5.799 -5.382,5.597 -5.67,5.392 -5.667,5.595 -5.661,5.797 -5.661,6 c 0,0.203 -0.006,0.405 -0.009,0.608 m -2.912,3.876 c 0.293,0.13 0.586,0.263 0.873,0.382 0.039,-0.306 0.077,-0.615 0.109,-0.939 -0.175,0.103 -0.348,0.209 -0.524,0.309 -0.152,0.087 -0.305,0.164 -0.458,0.248 m -4.891,-0.557 c 0.033,0.324 0.071,0.633 0.11,0.939 0.287,-0.119 0.58,-0.252 0.872,-0.382 -0.152,-0.084 -0.305,-0.161 -0.457,-0.248 -0.177,-0.1 -0.35,-0.206 -0.525,-0.309 m -1.929,-4.535 c -0.288,0.205 -0.561,0.407 -0.826,0.608 0.265,0.201 0.538,0.403 0.826,0.608 -0.003,-0.203 -0.009,-0.405 -0.009,-0.608 0,-0.203 0.006,-0.405 0.009,-0.608 m 2.911,-3.876 c -0.292,-0.13 -0.585,-0.263 -0.872,-0.382 -0.039,0.306 -0.077,0.615 -0.11,0.939 0.175,-0.103 0.348,-0.209 0.525,-0.309 0.152,-0.087 0.305,-0.164 0.457,-0.248 M -7.6,2.073 C -7.632,1.749 -7.67,1.44 -7.709,1.134 c -0.287,0.119 -0.58,0.252 -0.873,0.382 0.153,0.084 0.306,0.161 0.458,0.248 0.176,0.1 0.349,0.206 0.524,0.309 m -1.389,1.212 c -0.517,-0.294 -1.033,-0.573 -1.547,-0.838 -0.514,0.265 -1.03,0.544 -1.547,0.838 -0.541,0.308 -1.047,0.616 -1.537,0.923 -0.024,0.577 -0.041,1.169 -0.041,1.792 0,0.623 0.017,1.215 0.041,1.792 0.49,0.307 0.996,0.615 1.537,0.923 0.517,0.294 1.033,0.573 1.547,0.838 0.514,-0.265 1.03,-0.544 1.547,-0.838 C -8.448,8.407 -7.942,8.099 -7.453,7.792 -7.428,7.215 -7.411,6.623 -7.411,6 -7.411,5.377 -7.428,4.785 -7.453,4.208 -7.942,3.901 -8.448,3.593 -8.989,3.285 m 7.459,9.154 c 0.801,0 1.374,-0.164 1.53,-0.438 0.347,-0.609 -0.724,-2.526 -3.448,-4.874 -0.727,0.564 -1.499,1.118 -2.307,1.652 -0.062,0.93 -0.156,1.841 -0.279,2.72 1.746,0.602 3.309,0.94 4.504,0.94 M -2.073,6 c 2.888,2.529 4.589,5.118 3.594,6.867 -0.5,0.877 -1.527,1.322 -3.051,1.322 -1.299,0 -2.961,-0.345 -4.796,-0.954 -0.763,3.821 -2.178,6.64 -4.21,6.64 -2.032,0 -3.447,-2.819 -4.211,-6.64 -1.834,0.609 -3.497,0.954 -4.795,0.954 -1.524,0 -2.552,-0.445 -3.052,-1.323 C -23.589,11.118 -21.888,8.529 -19,6 c -2.888,-2.529 -4.589,-5.118 -3.594,-6.867 0.5,-0.877 1.528,-1.322 3.052,-1.322 1.298,0 2.961,0.345 4.795,0.954 0.764,-3.821 2.179,-6.64 4.211,-6.64 2.032,0 3.447,2.819 4.21,6.64 1.835,-0.609 3.497,-0.954 4.796,-0.954 1.524,0 2.551,0.445 3.051,1.323 C 2.516,0.882 0.815,3.471 -2.073,6"/></g><g transform="translate(18,19.4142)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.781,0 -1.414,-0.633 -1.414,-1.414 0,-0.781 0.633,-1.414 1.414,-1.414 0.781,0 1.414,0.633 1.414,1.414 C 1.414,-0.633 0.781,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#9266CC" d="M36 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v28z"/><g fill="#FFF"><path d="M26.464 18c2.888-2.529 4.589-5.118 3.594-6.867-.5-.877-1.527-1.322-3.052-1.322-1.298 0-2.961.346-4.795.954-.764-3.821-2.178-6.64-4.211-6.64s-3.447 2.819-4.211 6.64c-1.834-.608-3.497-.954-4.795-.954-1.524 0-2.552.445-3.052 1.323-.995 1.748.706 4.337 3.594 6.866-2.888 2.529-4.589 5.118-3.594 6.867.5.877 1.527 1.322 3.052 1.322 1.298 0 2.961-.346 4.795-.954.764 3.821 2.178 6.64 4.211 6.64s3.447-2.819 4.211-6.64c1.834.608 3.497.954 4.795.954 1.524 0 2.552-.445 3.052-1.323.995-1.748-.707-4.337-3.594-6.866zm.542-6.439c.802 0 1.374.164 1.53.438.347.609-.724 2.526-3.448 4.874-.727-.564-1.499-1.118-2.307-1.652-.062-.93-.156-1.841-.279-2.72 1.746-.602 3.309-.94 4.504-.94zm-7.459 9.154c-.517.294-1.033.573-1.547.838-.514-.265-1.03-.543-1.547-.838-.541-.308-1.047-.616-1.536-.923-.024-.577-.042-1.169-.042-1.792s.017-1.215.042-1.792c.49-.307.995-.615 1.536-.923.517-.294 1.033-.573 1.547-.838.514.265 1.03.543 1.547.838.541.308 1.047.616 1.536.923.024.577.042 1.169.042 1.792s-.017 1.215-.042 1.792c-.489.307-.995.615-1.536.923zm1.389 1.212c-.032.324-.07.633-.11.939-.287-.118-.58-.251-.872-.382.153-.084.305-.161.458-.248.177-.1.349-.206.524-.309zm-4.89.557c-.292.13-.586.263-.872.382-.039-.306-.077-.615-.11-.938.175.103.348.209.524.309.152.086.305.163.458.247zm-2.912-3.876c-.288-.205-.561-.407-.826-.608.265-.201.538-.403.826-.608-.003.203-.009.405-.009.608s.006.405.009.608zm1.93-4.535c.032-.324.07-.633.11-.938.287.118.58.251.872.382-.153.084-.305.161-.458.248-.177.099-.349.205-.524.308zm4.89-.557c.292-.13.586-.263.872-.382.039.306.077.615.11.939-.175-.103-.348-.209-.524-.309-.152-.087-.305-.164-.458-.248zm2.912 3.876c.288.205.561.407.826.608-.265.201-.538.403-.826.608.003-.203.009-.405.009-.608s-.006-.405-.009-.608zM18 5.875c.706 0 1.855 1.908 2.546 5.494-.83.33-1.683.713-2.546 1.132-.863-.42-1.716-.803-2.546-1.132.691-3.586 1.84-5.494 2.546-5.494zM7.464 12c.156-.275.729-.439 1.53-.439 1.194 0 2.758.339 4.504.94-.123.879-.218 1.79-.279 2.72-.808.534-1.58 1.088-2.307 1.652C8.188 14.525 7.117 12.608 7.464 12zm1.53 12.439c-.802 0-1.374-.164-1.53-.438-.347-.609.724-2.526 3.448-4.874.727.564 1.499 1.118 2.307 1.652.062.93.156 1.841.279 2.72-1.746.602-3.309.94-4.504.94zM18 30.125c-.706 0-1.855-1.908-2.546-5.494.83-.33 1.683-.713 2.546-1.132.863.42 1.716.803 2.546 1.132-.691 3.586-1.84 5.494-2.546 5.494zM28.536 24c-.156.275-.729.439-1.53.439-1.194 0-2.758-.339-4.504-.94.123-.879.218-1.79.279-2.72.808-.534 1.58-1.088 2.307-1.652 2.724 2.348 3.795 4.265 3.448 4.873z"/><path d="M18 16.586c-.781 0-1.414.633-1.414 1.414 0 .781.633 1.414 1.414 1.414s1.414-.633 1.414-1.414c0-.781-.633-1.414-1.414-1.414z"/></g></svg>
\ No newline at end of file