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/262a.svg b/public/emoji/262a.svg
index 478d46894..678a1e8fe 100644
--- a/public/emoji/262a.svg
+++ b/public/emoji/262a.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(32.6639,17.2955)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -3.959,1.595 -3.664,5.854 -6.406,2.582 -10.365,4.177 -8.1,0.56 -10.841,-2.712 -6.7,-1.678 -4.436,-5.295 -4.141,-1.037 0,0 Z"/></g><g transform="translate(32.6639,17.2955)" id="g28"><path id="path30" style="fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" d="M 0,0 -3.959,1.595 -3.664,5.854 -6.406,2.582 -10.365,4.177 -8.1,0.56 -10.841,-2.712 -6.7,-1.678 -4.436,-5.295 -4.141,-1.037 0,0 Z"/></g><g transform="translate(27.0928,7.7908)" id="g32"><path id="path34" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.316,-0.527 -2.693,-0.799 -4.093,-0.799 -6.065,0 -11,4.926 -11,10.992 0,6.065 4.935,10.983 11,10.983 1.402,0 2.779,-0.301 4.092,-0.828 0.122,-0.05 0.385,-0.136 0.393,-0.139 0.64,-0.281 1.859,1.031 0.47,2.015 -2.615,1.953 -5.708,2.985 -8.955,2.985 -8.271,0 -15,-6.729 -15,-15 0,-8.271 6.729,-15 15,-15 3.295,0 6.432,1.062 9.071,3.07 0.398,0.304 0.51,0.854 0.264,1.289 C 0.994,0.003 0.46,0.186 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="M32.664 18.705l-3.959-1.596.295-4.258-2.742 3.272-3.959-1.596 2.265 3.617-2.741 3.273 4.141-1.035L28.228 24l.295-4.258z"/><path d="M28.228 24.5c-.17 0-.331-.086-.424-.234l-2.071-3.311-3.788.947c-.21.053-.431-.036-.545-.22-.115-.184-.099-.421.04-.587l2.509-2.994-2.073-3.309c-.115-.184-.099-.42.04-.586.14-.167.37-.224.57-.143l3.622 1.459 2.51-2.993c.139-.166.367-.223.57-.143.2.081.326.282.312.499l-.271 3.896 3.622 1.459c.201.081.327.282.312.498-.015.216-.167.398-.378.451l-3.788.948-.271 3.896c-.016.217-.168.398-.378.451-.039.011-.08.016-.12.016zm-2.264-4.618c.17 0 .331.086.424.234l1.447 2.314.189-2.724c.016-.217.168-.398.378-.451l2.647-.663-2.531-1.02c-.201-.081-.327-.282-.312-.499l.188-2.723-1.754 2.092c-.139.166-.369.224-.569.143l-2.531-1.02 1.448 2.312c.115.184.099.42-.04.586l-1.754 2.094 2.648-.662c.041-.008.082-.013.122-.013z"/></g><path fill="#FFF" d="M27.093 28.209c-1.316.527-2.693.799-4.093.799-6.065 0-11-4.926-11-10.992S16.935 7.033 23 7.033c1.401 0 2.778.301 4.092.828.122.05.385.136.392.139.641.281 1.859-1.031.471-2.015C25.34 4.032 22.247 3 19 3 10.729 3 4 9.729 4 18s6.729 15 15 15c3.295 0 6.432-1.061 9.07-3.07.398-.304.511-.853.265-1.288-.248-.436-.782-.618-1.242-.433z"/></svg>
\ No newline at end of file