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/1f32b.svg b/public/emoji/1f32b.svg
index f22dfdd84..08281c9ae 100644
--- a/public/emoji/1f32b.svg
+++ b/public/emoji/1f32b.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 4,36 C 1.791,36 0,34.209 0,32 L 0,32 0,4 C 0,1.791 1.791,0 4,0 l 0,0 28,0 c 2.209,0 4,1.791 4,4 l 0,0 0,28 c 0,2.209 -1.791,4 -4,4 l 0,0 -28,0 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"><path id="path20" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 37,-1 -38,0 0,38 38,0 0,-38 z"/><g transform="translate(3,31)" id="g22"><path id="path24" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.125,0 3.928,-1.33 4.652,-3.198 5.439,-1.887 6.859,-1 8.5,-1 9.263,-1 9.97,-1.207 10.599,-1.542 11.227,-0.611 12.293,0 13.5,0 15.024,0 16.308,-0.981 16.788,-2.342 17.316,-2.124 17.893,-2 18.5,-2 c 1.757,0 3.263,-1.018 4.004,-2.486 0.604,0.3 1.275,0.486 1.996,0.486 1.183,0 2.25,-0.466 3.054,-1.213 0.767,0.961 1.934,1.588 3.258,1.588 C 33.125,-3.625 35,-5.5 35,-7.812 35,-10.125 33.125,-12 30.812,-12 c -0.995,0 -1.897,0.361 -2.616,0.942 C 27.384,-12.229 26.034,-13 24.5,-13 c -0.561,0 -1.092,0.115 -1.587,0.303 C 22.48,-12.889 22.004,-13 21.5,-13 c -1.4,0 -2.599,0.828 -3.159,2.016 -1.132,0.041 -2.155,0.494 -2.924,1.22 C 14.871,-10.51 13.996,-11 13,-11 c -1.09,0 -2.035,0.587 -2.561,1.456 C 9.851,-9.828 9.198,-10 8.5,-10 6.669,-10 5.101,-8.902 4.398,-7.332 3.558,-8.912 1.914,-10 0,-10 c -2.762,0 -5,2.238 -5,5 0,2.762 2.238,5 5,5"/></g><g transform="translate(6,27.291)" id="g26"><path id="path28" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.926,0 5.429,-1.796 6.475,-4.344 6.65,-4.325 6.82,-4.291 7,-4.291 c 0.702,0 1.369,-0.147 1.976,-0.409 0.733,0.855 1.809,1.409 3.024,1.409 2.209,0 4,-1.791 4,-4 0,-0.05 -0.013,-0.097 -0.015,-0.146 0.326,0.085 0.662,0.146 1.015,0.146 0.876,0 1.679,-0.289 2.338,-0.767 0.597,0.473 1.342,0.767 2.162,0.767 0.198,0 0.388,-0.026 0.577,-0.059 0.637,1.78 2.321,3.059 4.319,3.059 2.542,0 4.604,-2.061 4.604,-4.604 0,-2.543 -2.062,-6.605 -4.604,-6.605 -0.783,0 -29.061,-2.5 -30.396,-2.5 -3.866,0 -3,7.134 -3,11 0,3.866 3.134,7 7,7"/></g><g transform="translate(34,16)" id="g30"><path id="path32" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.125,0 -3.928,-1.33 -4.652,-3.198 -5.438,-1.887 -6.859,-1 -8.5,-1 -9.263,-1 -9.97,-1.207 -10.599,-1.542 -11.227,-0.611 -12.293,0 -13.5,0 -15.024,0 -16.308,-0.981 -16.788,-2.342 -17.316,-2.124 -17.893,-2 -18.5,-2 c -1.757,0 -3.263,-1.018 -4.004,-2.486 -0.604,0.3 -1.275,0.486 -1.996,0.486 -1.183,0 -2.25,-0.466 -3.054,-1.213 -0.767,0.961 -1.934,1.588 -3.258,1.588 -2.313,0 -4.188,-1.875 -4.188,-4.187 0,-2.313 1.875,-4.188 4.188,-4.188 0.995,0 1.897,0.361 2.616,0.942 0.812,-1.172 2.162,-1.942 3.696,-1.942 0.561,0 1.092,0.115 1.587,0.303 0.433,-0.192 0.909,-0.303 1.413,-0.303 1.4,0 2.599,0.828 3.159,2.016 1.132,0.041 2.155,0.494 2.924,1.22 0.546,-0.746 1.421,-1.236 2.417,-1.236 1.09,0 2.035,0.587 2.561,1.456 C -9.851,-9.828 -9.198,-10 -8.5,-10 c 1.831,0 3.399,1.098 4.103,2.668 C -3.558,-8.912 -1.914,-10 0,-10 c 2.762,0 5,2.238 5,5 0,2.762 -2.238,5 -5,5"/></g><g transform="translate(20,27)" id="g34"><path id="path36" style="fill:#fe5011;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0,2 -2,2 -4,2 -4,0 -4,0 l 0,-28 4,0 0,28 z"/></g><g transform="translate(-2,9)" id="g38"><path id="path40" style="fill:#fe5011;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,2 c 0.117,0.049 11.263,4.451 18,16 l 2,-1 C 12.911,4.847 0.503,0.206 0,0"/></g><path id="path42" style="fill:#fe5011;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 36,5 0,5 0,9 36,9 36,5 Z"/><g transform="translate(38,9)" id="g44"><path id="path46" style="fill:#fe5011;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,2 c -0.117,0.049 -11.264,4.451 -18,16 l -2,-1 C -12.91,4.847 -0.503,0.206 0,0"/></g><path id="path48" style="fill:#fe5011;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 10,8 2,0 0,11 -2,0 0,-11 z"/><path id="path50" style="fill:#fe5011;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26,8 -2,0 0,11 2,0 0,-11 z"/><path id="path52" style="fill:#fe5011;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 4,8 6,8 6,14 4,14 4,8 Z"/><path id="path54" style="fill:#fe5011;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 32,7 -2,0 0,7 2,0 0,-7 z"/><g transform="translate(-7.0475,14.7007)" id="g56"><path id="path58" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2.758,0.281 5.29,-1.172 6.521,-3.473 0.164,0.034 0.321,0.083 0.49,0.1 0.662,0.067 1.305,-0.008 1.902,-0.196 0.61,0.877 1.571,1.502 2.716,1.619 2.083,0.212 3.943,-1.304 4.155,-3.387 0.005,-0.047 -0.002,-0.092 10e-4,-0.139 0.298,0.112 0.609,0.201 0.942,0.235 0.826,0.084 1.611,-0.111 2.278,-0.498 0.517,0.503 1.191,0.852 1.965,0.93 0.186,0.019 0.368,0.013 0.549,0.001 0.43,1.738 1.895,3.106 3.778,3.298 2.397,0.244 4.539,-1.501 4.783,-3.899 0.244,-2.397 -1.501,-4.539 -3.899,-4.783 -0.738,-0.075 -1.442,0.057 -2.083,0.319 -0.526,-0.83 -1.402,-1.427 -2.456,-1.535 -0.515,-0.052 -1.009,0.027 -1.465,0.193 -0.611,-0.85 -1.558,-1.453 -2.681,-1.568 -1.63,-0.166 -3.112,0.734 -3.786,2.128 -0.477,-0.427 -1.083,-0.719 -1.768,-0.789 -0.365,-0.037 -0.717,0.003 -1.054,0.084 -0.75,-0.78 -1.755,-1.322 -2.916,-1.441 -1.224,-0.124 -2.379,0.242 -3.295,0.922 -0.938,-0.713 -2.074,-1.191 -3.332,-1.32 -3.645,-0.371 -6.901,2.282 -7.272,5.927 C -6.298,-3.627 -3.645,-0.371 0,0"/></g><g transform="translate(29,7)" id="g60"><path id="path62" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 2.209,0 4,-1.791 4,-4"/></g><g transform="translate(33,12.291)" id="g64"><path id="path66" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.926,0 -5.429,-1.796 -6.475,-4.344 -6.65,-4.325 -6.82,-4.291 -7,-4.291 c -0.702,0 -1.369,-0.147 -1.976,-0.409 -0.733,0.855 -1.809,1.409 -3.024,1.409 -2.209,0 -4,-1.791 -4,-4 0,-0.05 0.013,-0.097 0.015,-0.146 -0.326,0.085 -0.662,0.146 -1.015,0.146 -0.876,0 -1.679,-0.289 -2.338,-0.767 -0.597,0.473 -1.342,0.767 -2.162,0.767 -0.198,0 -0.388,-0.026 -0.577,-0.059 -0.637,1.78 -2.321,3.059 -4.319,3.059 -1.987,0 -3.664,-1.266 -4.31,-3.03 -0.099,0.008 -0.193,0.03 -0.294,0.03 -2.209,0 -4,-1.791 -4,-4 0,-2.209 1.791,-4 4,-4 1.462,0 8.382,1 9.5,1 l 21.667,0 C 4.033,-14.291 7,-10.866 7,-7 7,-3.134 3.866,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F5F8FA" d="M32 0H4C1.791 0 0 1.791 0 4v28c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4V4c0-2.209-1.791-4-4-4z"/><path fill="#E1E8ED" d="M36 16.368V9.257c-.638-.394-1.383-.632-2.188-.632-1.325 0-2.491.627-3.259 1.588C29.75 9.466 28.683 9 27.5 9c-.721 0-1.392.185-1.996.486C24.763 8.018 23.257 7 21.5 7c-.607 0-1.184.124-1.712.342C19.308 5.981 18.024 5 16.5 5c-1.207 0-2.273.611-2.901 1.542C12.97 6.207 12.263 6 11.5 6c-1.641 0-3.062.887-3.848 2.198C6.928 6.33 5.125 5 3 5c-1.131 0-2.162.389-3 1.022v7.955C.838 14.611 1.869 15 3 15c1.914 0 3.558-1.088 4.398-2.668C8.101 13.902 9.669 15 11.5 15c.698 0 1.351-.172 1.94-.456C13.965 15.413 14.91 16 16 16c.996 0 1.871-.49 2.417-1.236.769.727 1.792 1.18 2.924 1.221C21.901 17.172 23.1 18 24.5 18c.504 0 .981-.111 1.413-.303.495.188 1.027.303 1.587.303 1.534 0 2.884-.771 3.696-1.942.719.581 1.621.942 2.616.942.805 0 1.55-.238 2.188-.632z"/><path fill="#CCD6DD" d="M36 14.771C35.157 13.7 33.864 13 32.396 13c-1.997 0-3.681 1.279-4.318 3.059-.19-.033-.38-.059-.578-.059-.82 0-1.565.294-2.162.767C24.679 16.289 23.876 16 23 16c-.353 0-.689.06-1.015.146.002-.049.015-.096.015-.146 0-2.209-1.791-4-4-4-1.215 0-2.291.554-3.024 1.409C14.369 13.148 13.702 13 13 13c-.18 0-.35.034-.525.053C11.429 10.505 8.926 8.709 6 8.709c-2.551 0-4.777 1.369-6 3.408v13.544c.458.647 1.096 1.048 2 1.048 1.335 0 29.613-2.5 30.396-2.5 1.461 0 2.761-1.343 3.604-2.966v-6.472z"/><path fill="#E1E8ED" d="M36 29.578v-9.156c-.613-.268-1.288-.422-2-.422-2.125 0-3.928 1.33-4.652 3.198C28.562 21.887 27.141 21 25.5 21c-.763 0-1.47.207-2.099.542C22.773 20.611 21.707 20 20.5 20c-1.524 0-2.808.981-3.288 2.342-.528-.218-1.105-.342-1.712-.342-1.757 0-3.263 1.018-4.004 2.486C10.892 24.185 10.221 24 9.5 24c-1.183 0-2.25.466-3.054 1.213-.768-.961-1.934-1.588-3.259-1.588-1.284 0-2.419.591-3.188 1.501v5.373C.768 31.409 1.903 32 3.188 32c.995 0 1.897-.361 2.616-.942C6.616 32.229 7.966 33 9.5 33c.56 0 1.092-.115 1.587-.303.432.192.909.303 1.413.303 1.4 0 2.599-.828 3.159-2.016 1.132-.041 2.155-.494 2.924-1.221C19.129 30.51 20.004 31 21 31c1.09 0 2.035-.587 2.56-1.456.589.284 1.242.456 1.94.456 1.831 0 3.399-1.098 4.102-2.668C30.442 28.912 32.086 30 34 30c.712 0 1.387-.154 2-.422z"/><path fill="#FE5011" d="M36 24.059C32.465 22.229 25.013 17.594 20 9c0 0 0-2-2-2s-2 2-2 2C10.987 17.594 3.535 22.229 0 24.059v2.068c1.044-.495 2.422-1.204 4-2.169V24h2v-1.341c1.284-.88 2.637-1.908 4-3.094V27h2v-9.292c1.384-1.375 2.74-2.923 4-4.655V24h4V13.054c1.26 1.731 2.616 3.28 4 4.655V26h2v-6.435c1.362 1.186 2.716 2.214 4 3.095V25h2v-1.042c1.578.965 2.956 1.674 4 2.169v-2.068z"/><path fill="#F5F8FA" d="M25 25c-.821 0-1.582.249-2.217.673-.664-1.839-2.5-3.07-4.534-2.863-1.883.192-3.348 1.56-3.777 3.298-.181-.012-.363-.019-.55 0-.773.079-1.448.427-1.965.93-.667-.387-1.452-.582-2.278-.498-.333.034-.644.123-.942.236-.003-.047.004-.093 0-.139-.212-2.083-2.073-3.599-4.155-3.387-1.145.117-2.107.742-2.716 1.619-.586-.186-1.217-.258-1.866-.197V32c0 .773.23 1.489.61 2.101.106-.004.208.009.315-.001 1.161-.118 2.166-.661 2.916-1.44.337.081.689.121 1.053.083.686-.07 1.292-.361 1.768-.789.674 1.394 2.156 2.294 3.786 2.128 1.124-.115 2.07-.718 2.682-1.568.456.167.95.246 1.465.193 1.054-.107 1.93-.705 2.456-1.535.641.262 1.346.394 2.084.319.836-.085 1.584-.412 2.205-.889C21.957 32.013 23.362 33 25 33c2.209 0 4-1.791 4-4s-1.791-4-4-4z"/><path fill="#CCD6DD" d="M32 36c2.209 0 4-1.791 4-4v-7.608c-.91-.433-1.925-.683-3-.683-2.926 0-5.429 1.796-6.475 4.344C26.35 28.034 26.18 28 26 28c-.702 0-1.369.147-1.976.409C23.291 27.554 22.215 27 21 27c-2.209 0-4 1.791-4 4 0 .05.013.097.015.146C16.689 31.06 16.353 31 16 31c-.876 0-1.679.289-2.338.767C13.065 31.294 12.32 31 11.5 31c-.198 0-.388.026-.577.059C10.286 29.279 8.602 28 6.604 28c-1.987 0-3.665 1.266-4.31 3.03C2.195 31.022 2.101 31 2 31c-.732 0-1.41.211-2 .555V32c0 2.209 1.791 4 4 4h28z"/></svg>
\ No newline at end of file