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/1f3e7.svg b/public/emoji/1f3e7.svg
index 520b82114..e4c0000bb 100644
--- a/public/emoji/1f3e7.svg
+++ b/public/emoji/1f3e7.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:#3b88c3;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><path id="path24" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 36,9 0,9 0,26 36,26 36,9 Z"/><g transform="translate(5.4736,16.4502)" id="g26"><path id="path28" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 3.041,0 1.552,4.642 1.521,4.642 0,0 Z m -0.176,5.81 c 0.272,0.736 0.896,1.329 1.713,1.329 0.848,0 1.44,-0.561 1.712,-1.329 l 3.137,-8.707 c 0.096,-0.256 0.129,-0.481 0.129,-0.593 0,-0.624 -0.513,-1.056 -1.105,-1.056 -0.672,0 -1.008,0.352 -1.168,0.832 l -0.481,1.505 -4.449,0 -0.48,-1.489 c -0.161,-0.496 -0.497,-0.848 -1.153,-0.848 -0.64,0 -1.184,0.48 -1.184,1.12 0,0.256 0.079,0.449 0.111,0.529 l 3.218,8.707 z"/></g><g transform="translate(14.4648,21.1875)" id="g30"><path id="path32" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.745,0 c -0.768,0 -1.088,0.561 -1.088,1.105 0,0.56 0.4,1.104 1.088,1.104 l 5.891,0 C 4.834,2.209 5.234,1.665 5.234,1.105 5.234,0.561 4.914,0 4.146,0 l -1.745,0 0,-8.035 c 0,-0.8 -0.512,-1.248 -1.2,-1.248 C 0.512,-9.283 0,-8.835 0,-8.035 L 0,0 Z"/></g><g transform="translate(22.0332,22.2603)" id="g34"><path id="path36" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.096,0.576 0.72,1.232 1.568,1.232 0.801,0 1.424,-0.576 1.601,-1.152 l 1.89,-6.338 0.031,0 1.889,6.338 c 0.175,0.576 0.8,1.152 1.599,1.152 0.85,0 1.473,-0.656 1.57,-1.232 l 1.489,-8.932 c 0.015,-0.096 0.015,-0.192 0.015,-0.272 0,-0.704 -0.511,-1.152 -1.152,-1.152 -0.816,0 -1.137,0.368 -1.248,1.12 l -0.945,6.515 -0.032,0 -1.921,-6.707 c -0.112,-0.384 -0.417,-0.928 -1.28,-0.928 -0.865,0 -1.169,0.544 -1.281,0.928 l -1.92,6.707 -0.033,0 -0.944,-6.515 c -0.113,-0.752 -0.432,-1.12 -1.249,-1.12 -0.639,0 -1.152,0.448 -1.152,1.152 0,0.08 0,0.176 0.017,0.272 L 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#3B88C3" 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"/><path fill="#BBDDF5" d="M0 10h36v17H0z"/><path d="M5.297 13.74c.272-.736.896-1.329 1.713-1.329.848 0 1.44.561 1.712 1.329l3.137 8.708c.096.256.128.48.128.593 0 .624-.512 1.056-1.105 1.056-.672 0-1.008-.352-1.168-.832l-.48-1.505h-4.45l-.48 1.489c-.16.496-.497.848-1.153.848-.64 0-1.184-.479-1.184-1.12 0-.256.08-.448.112-.528l3.218-8.709zm.177 5.81h3.041l-1.489-4.642h-.032l-1.52 4.642zm8.991-4.738H12.72c-.768 0-1.088-.561-1.088-1.104 0-.561.4-1.104 1.088-1.104h5.89c.688 0 1.089.544 1.089 1.104 0 .544-.32 1.104-1.089 1.104h-1.745v8.035c0 .8-.512 1.248-1.2 1.248s-1.201-.448-1.201-1.248v-8.035zm7.568-1.072c.096-.576.72-1.232 1.568-1.232.801 0 1.424.576 1.601 1.152l1.89 6.338h.031l1.889-6.338c.176-.576.801-1.152 1.6-1.152.85 0 1.473.656 1.57 1.232l1.488 8.932c.016.096.016.191.016.271 0 .704-.512 1.152-1.152 1.152-.816 0-1.137-.368-1.248-1.12l-.945-6.515h-.031l-1.922 6.707c-.111.384-.416.928-1.279.928-.865 0-1.169-.544-1.281-.928l-1.92-6.707h-.033l-.943 6.515c-.113.752-.433 1.12-1.249 1.12-.64 0-1.152-.448-1.152-1.152 0-.08 0-.176.017-.271l1.485-8.932z" fill="#269"/></svg>
\ No newline at end of file