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/1f6a7.svg b/public/emoji/1f6a7.svg
index 39dbfd5af..a5d135cba 100644
--- a/public/emoji/1f6a7.svg
+++ b/public/emoji/1f6a7.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 8,33 4,33 C 1.791,33 0,31.209 0,29 l 0,0 0,-8 c 0,-2.209 1.791,-4 4,-4 l 0,0 28,0 c 2.209,0 4,1.791 4,4 l 0,0 0,8 c 0,2.209 -1.791,4 -4,4 l 0,0 -24,0 z"/></clipPath><clipPath id="clipPath56" clipPathUnits="userSpaceOnUse"><path id="path58" 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,21)" id="g20"><path id="path22" style="fill:#ffcc4d;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,8 c 0,2.209 1.791,4 4,4 l 4,0 24,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"><g transform="translate(2,34)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -18,-18 5,0 L 5,0 0,0 Z"/></g><g transform="translate(13,34)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -18,-18 5,0 L 5,0 0,0 Z"/></g><g transform="translate(24,34)" id="g40"><path id="path42" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -18,-18 5,0 L 5,0 0,0 Z"/></g><g transform="translate(35,34)" id="g44"><path id="path46" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -18,-18 5,0 L 5,0 0,0 Z"/></g><g transform="translate(46,34)" id="g48"><path id="path50" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -18,-18 5,0 L 5,0 0,0 Z"/></g></g></g><g id="g52"><g clip-path="url(#clipPath56)" id="g54"><path id="path60" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 9,3 4,3 4,17 9,17 9,3 Z"/><path id="path62" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 32,3 -5,0 0,14 5,0 0,-14 z"/></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCC4D" d="M36 15c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V7c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v8z"/><path d="M6 3H4C1.791 3 0 4.791 0 7v2l6-6zm6 0L0 15c0 1.36.682 2.558 1.72 3.28L17 3h-5zM7 19h5L28 3h-5zm16 0L35.892 6.108c-.281-1.23-1.126-2.24-2.252-2.748L18 19h5zm13-4v-3l-7 7h3c2.209 0 4-1.791 4-4z" fill="#292F33"/><path fill="#99AAB5" d="M4 19h5v14H4zm23 0h5v14h-5z"/></svg>
\ No newline at end of file