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/270a.svg b/public/emoji/270a.svg
index de1946265..2e25dd39c 100644
--- a/public/emoji/270a.svg
+++ b/public/emoji/270a.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(18,25.9131)" id="g20"><path id="path22" style="fill:#ef9645;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 5.007,0.047 6.015,0 c 0.973,0 2.266,0.038 3.196,-0.874 C 13.407,0.36 12.046,1.141 10.5,1.141 l -0.5,0 -0.243,0.093 -5.657,0 0.016,4 c 0,0.812 0.531,1.578 0.734,1.998 C 3.754,6.641 3,5.496 3,4.163 L 2.913,3.891 2.913,1.234 0,1.219 c -1.201,0 -2.182,-0.427 -2.915,-1.266 l -0.016,1.375 0.016,4.828 c 0,0.758 0.406,1.438 0.668,1.954 C -3.29,7.418 -4,6.141 -4,4.663 L -4,4.141 -4.181,3.163 -4.15,-4.859 c 0,-0.892 -0.414,-1.576 -1.031,-2.125 -0.53,-0.472 -1.053,-0.657 -1.819,-0.657 -1.657,0 -2.884,1.281 -2.884,2.938 L -9.9,4.375 c 0,0.816 0.453,1.391 0.757,1.861 C -10.243,5.646 -11,4.499 -11,3.163 l 0,-1.886 -0.072,-0.215 0,-6.058 c 0,-1.988 -1.89,-2.785 -2.828,-2.785 -1.718,0 -3.1,1.203 -3.1,2.785 l 0,-2.645 c 0,0 0.185,-0.209 0.194,-0.312 0.881,-0.883 2.156,-1.016 2.984,-1.016 1.594,0 2.684,0.851 3.338,2.063 0.677,-1.213 1.912,-2.016 3.428,-2.016 1.516,0 3.685,0.738 4.056,3.344 0.141,-0.167 0.506,-0.51 0.678,-0.641 C -1.618,-6.75 -0.737,-6.953 0,-6.953 l 1.116,0.031 1.734,0 c -0.535,-0.27 -0.777,-0.552 -1.203,-0.937 -1.729,-1.568 -2.578,-4.094 -2.578,-7.672 0,-0.277 0.317,-0.563 0.594,-0.563 0.276,0 0.578,0.318 0.578,0.594 0,3.962 0.973,6.327 3.203,7.563 1.175,0.651 2.626,0.968 4.516,0.968 0.058,0 0.562,0.032 0.562,0.032 0.277,0 0.594,0.333 0.594,0.609 0,0.276 -0.271,0.547 -0.547,0.547 l -6.437,0 L 0,-5.766 c -1.657,0 -2.915,1.281 -2.915,2.938 C -2.915,-1.171 -1.657,0 0,0"/></g><g transform="translate(4.124,17.0537)" id="g24"><path id="path26" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.474,0 2.738,0.831 3.392,2.043 4.069,0.83 5.35,0 6.838,0 l 0.076,0 c 1.153,0 2.169,0.51 2.889,1.298 0.023,0.025 0.051,0.043 0.073,0.068 l 0,0.014 c 0.185,0.212 0.343,0.448 0.481,0.695 0.039,0.073 0.069,0.152 0.105,0.227 0.093,0.194 0.176,0.394 0.236,0.606 0.052,0.173 0.107,0.344 0.134,0.526 0.141,-0.167 0.296,-0.32 0.46,-0.461 C 11.361,2.914 11.439,2.866 11.513,2.811 11.629,2.725 11.742,2.634 11.868,2.56 12.457,2.21 13.139,2 13.876,2 l 3.166,0 C 16.507,1.73 16.043,1.386 15.617,1 c -1.729,-1.568 -2.578,-4.085 -2.578,-7.663 0,-0.277 0.223,-0.5 0.5,-0.5 0.276,0 0.5,0.223 0.5,0.5 0,3.962 1.01,6.427 3.24,7.663 1.174,0.651 2.682,0.967 4.571,0.967 0.059,0 0.526,0.033 0.526,0.033 0.276,0 0.5,0.224 0.5,0.5 0,0.276 -0.224,0.5 -0.5,0.5 l -8.5,0 c -1.657,0 -3,1.343 -3,3 0,1.657 1.343,3 3,3 l 11,0 c 0.973,0 2.288,-0.056 3.218,-0.967 0.324,-0.318 0.604,-0.736 0.803,-1.298 l 1.659,-5.471 c 0.156,-0.512 0.73,-2.857 0.627,-3.346 0,-7.34 -8.701,-14.972 -19.004,-14.972 -9.977,0 -15.303,8.118 -15.303,18.043 l 0,0.23 C -3.114,1.208 -3.103,1.203 -3.093,1.192 -2.212,0.31 -1.294,0 -0.248,0 L 0,0 Z"/></g><g transform="translate(3.8643,30.0537)" id="g28"><path id="path30" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.271,0 c 1.582,0 2.865,-1.282 2.865,-2.864 l 0,-3.192 0,-3.08 C 3.136,-10.718 1.853,-12 0.271,-12 L 0,-12 c -1.582,0 -2.864,1.282 -2.864,2.864 l 0,0.636 0,5.636 C -2.864,-1.282 -1.582,0 0,0"/></g><g transform="translate(14,26.7782)" id="g32"><path id="path34" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-5.724 c 0,-0.892 -0.396,-1.684 -1.014,-2.233 -0.53,-0.472 -1.22,-0.767 -1.986,-0.767 -1.657,0 -3,1.343 -3,3 l 0,9 c 0,0.816 0.328,1.554 0.857,2.094 0.544,0.558 1.302,0.906 2.143,0.906 1.657,0 3,-1.344 3,-3 L 0,2.298 0,0 Z"/></g><g transform="translate(18,27.0537)" id="g36"><path id="path38" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.201,0 -2.267,-0.541 -3,-1.38 l 0,1.33 0,5.05 c 0,0.758 0.29,1.442 0.753,1.97 C -1.697,7.596 -0.899,8 0,8 1.657,8 3,6.657 3,5 L 3,3.522 3,3.022 3,0 0,0 Z"/></g><g transform="translate(22,31.0605)" id="g40"><path id="path42" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0.812 0.326,1.545 0.85,2.085 0.544,0.558 1.302,0.908 2.143,0.908 l 0.014,0 C 4.66,2.993 6,1.653 6,0 l 0,-0.984 0,-3.023 -6,0 L 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#EF9645" d="M18 10.087l5.007-.047h6.016c.973 0 2.265-.038 3.195.873-.81-1.187-2.172-1.967-3.718-1.967H28l-.243-.094H22.1l.016-4c0-.812.531-1.578.734-1.998-1.096.592-1.85 1.737-1.85 3.07l-.087.272v2.656L18 8.868c-1.201 0-2.182.427-2.915 1.266l-.016-1.375.016-4.828c0-.758.406-1.438.669-1.954C14.71 2.669 14 3.946 14 5.424v.522l-.181.978.031 8.022c0 .891-.414 1.576-1.031 2.125-.53.472-1.053.656-1.819.656-1.657 0-2.884-1.281-2.884-2.938L8.1 5.712c0-.816.453-1.391.756-1.861C7.757 4.441 7 5.588 7 6.924V8.81l-.072.214v6.058c0 1.989-1.891 2.786-2.828 2.786-1.719 0-3.1-1.203-3.1-2.786v2.645s.185.209.194.312c.881.882 2.156 1.016 2.984 1.016 1.594 0 2.684-.851 3.337-2.062.678 1.212 1.913 2.016 3.428 2.016s3.684-.738 4.056-3.344c.141.167.506.51.678.641.703.531 1.585.734 2.322.734l1.116-.031h1.734c-.535.27-.778.552-1.203.938-1.729 1.568-2.578 4.094-2.578 7.672 0 .276.317.562.594.562.276 0 .578-.317.578-.594 0-3.962.973-6.327 3.203-7.562 1.175-.651 2.626-.969 4.516-.969.059 0 .562-.031.562-.031.276 0 .594-.333.594-.609 0-.276-.271-.547-.547-.547H20.13L18 15.853c-1.657 0-2.915-1.281-2.915-2.938 0-1.657 1.258-2.828 2.915-2.828z"/><path fill="#FFDC5D" d="M4.124 18.946c1.474 0 2.738-.831 3.392-2.043.678 1.212 1.958 2.043 3.446 2.043h.076c1.153 0 2.169-.51 2.889-1.298.022-.025.051-.043.073-.068v-.014c.185-.212.343-.448.481-.695.04-.072.069-.151.105-.227.093-.194.176-.394.236-.606.052-.173.106-.344.134-.526.141.167.296.319.46.46.069.059.147.107.221.162.116.086.229.177.355.251.589.351 1.271.56 2.008.56h3.166c-.535.27-.999.614-1.424 1-1.729 1.568-2.579 4.085-2.579 7.663 0 .276.224.5.5.5s.5-.224.5-.5c0-3.962 1.01-6.427 3.24-7.663 1.175-.651 2.682-.967 4.571-.967.059 0 .526-.033.526-.033.276 0 .5-.224.5-.5s-.224-.5-.5-.5H18c-1.657 0-3-1.343-3-3s1.343-3 3-3h11c.973 0 2.288.056 3.218.967.325.318.604.736.803 1.297l1.659 5.472c.156.512.73 2.857.626 3.346 0 7.34-8.7 14.972-19.004 14.972C6.326 36 1 27.883 1 17.957v-.229c.01.01.021.016.031.026.881.882 1.799 1.192 2.845 1.192h.248z"/><path fill="#FFDC5D" d="M3.864 5.946h.271C5.718 5.946 7 7.229 7 8.81v6.273c0 1.582-1.282 2.864-2.864 2.864h-.272C2.282 17.946 1 16.664 1 15.082V8.81c0-1.581 1.282-2.864 2.864-2.864zM14 9.222v5.724c0 .891-.396 1.683-1.014 2.233-.53.472-1.221.767-1.986.767-1.657 0-3-1.343-3-3v-9c0-.816.328-1.554.857-2.095.544-.557 1.302-.905 2.143-.905 1.657 0 3 1.343 3 3v3.276zm4-.276c-1.201 0-2.267.541-3 1.38V3.947c0-.758.29-1.442.753-1.97C16.303 1.35 17.1.947 18 .947c1.657 0 3 1.343 3 3v5h-3zm4-4.007c0-.812.326-1.545.85-2.085.544-.559 1.301-.909 2.143-.909h.014C26.66 1.946 28 3.286 28 4.939v4.006h-6V4.939z"/></svg>
\ No newline at end of file