Merge pull request #157 from glitch-soc/merging-upstream

ABRACA-HRRRRRRRRRRRNGGGGGGGHHH!!!!!!!!!!!!!!!!!!!

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/270a-1f3fe.svg b/public/emoji/270a-1f3fe.svg
index 6b2ae91c6..dec8e82fe 100644
--- a/public/emoji/270a-1f3fe.svg
+++ b/public/emoji/270a-1f3fe.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" enable-background="new 0 0 64 64"><g fill="#b47d56"><path d="m53.1 24l-23.5-10.9-26 8.6c0 0-1.5 11.2 0 22.7 2.3 17.9 21.5 14.8 21.5 14.8 13.7 6.2 27.4.4 33.7-14.5 2.3-5.5 2.6-20.8-5.7-20.7"/><path d="m3.7 16.4c0-4 3-7.2 6.8-7.2h.1c3.7 0 6.8 3.2 6.8 7.2v11.1c0 4-3 7.2-6.8 7.2h-.1c-3.8 0-6.8-3.2-6.8-7.2v-11.1"/></g><path d="m8.5 32c3.8 0 6.8-3.2 6.8-7.1v-11.1c0-1.1-.3-2.2-.7-3.1 1.9 1.3 2.7 3.5 2.7 5.8v11.1c0 4-2.9 7.1-6.7 7.1h-.1c-2.7 0-5.1-1.7-6.2-4.2 1.2.9 2.7 1.5 4.2 1.5" fill="#935e3e"/><path d="m17.2 10c0-4 3-7.2 6.8-7.2h.1c3.8 0 6.8 3.2 6.8 7.2v11.1c0 4-3 7.2-6.8 7.2h-.1c-3.8 0-6.8-3.2-6.8-7.2 0 0 0-11.1 0-11.1" fill="#b47d56"/><path d="m22 25.6c3.8 0 6.8-3.1 6.8-7.1v-11.1c0-1.1-.3-2.2-.7-3.2 2 1.6 2.7 3.5 2.7 5.9v11.1c0 4-3 7-6.7 7h-.1c-2.7 0-5.1-1.7-6.2-4.2 1.2 1 2.7 1.6 4.2 1.6" fill="#935e3e"/><path d="m30.9 9.2c0-4 3-7.2 6.8-7.2h.1c3.7 0 6.8 3.2 6.8 7.2v11.1c0 4-3 7.2-6.8 7.2h-.1c-3.8 0-6.8-3.2-6.8-7.2v-11.1" fill="#b47d56"/><path d="m35.7 24.8c3.8 0 6.8-3.1 6.8-7.1v-11.1c0-1.1-.2-2.2-.6-3.1 2 1.5 2.7 3.5 2.7 5.8v11.1c0 4-3 7-6.8 7h-.1c-2.7 0-5.1-1.7-6.2-4.2 1.2 1 2.6 1.6 4.2 1.6" fill="#935e3e"/><path d="m44.3 12.8c0-4 3-7.2 6.8-7.2h.1c3.8 0 6.8 3.2 6.8 7.2v11.1c0 4-3 7.2-6.8 7.2h-.2c-3.8 0-6.8-3.2-6.8-7.2v-11.1z" fill="#b47d56"/><g fill="#935e3e"><path d="m49.2 28.4c3.8 0 6.7-3.2 6.7-7.1v-11.1c0-1.1-.2-2.2-.6-3.1 2.1 1.5 2.7 3.5 2.7 5.8v11.1c0 4-2.9 7.1-6.6 7.1h-.1c-2.7 0-5.1-1.7-6.2-4.2 1.1.9 2.5 1.5 4.1 1.5"/><path d="m41.6 32.3c-5.7-2.8-18.5 2-16 14 0-12.5 11.1-14.6 16-14"/><path d="m44.1 17c-5.3-3.7-7 1.1-16.6.5-4.2-.3-7 7.6-1 11.2 8.3 4.9 9.7-.8 11.6 1.7 2 2.6 4.1 3.3 5.7 6.2 1.2 2.1 12.5.1 14.1-3.9 3.2-7.7-5.5-9.8-13.8-15.7"/></g><path d="m44.7 18.5c-5.5-3.8-7.2 1.2-17.2.5-4.4-.3-7.3 7.9-1 11.6 8.7 5.1 10.1-.8 12.1 1.8 2.1 2.7 4.3 3.4 5.9 6.5 1.2 2.2-3.6 9.8-3.6 9.8s10.4 8.5 13.2 4.5c5.2-7.4 4.7-13.7 5.1-18.3.8-10.7-5.9-10.3-14.5-16.4" fill="#b47d56"/><g fill="#935e3e"><path d="m43.1 38.9c.4.7.2 1.9-.3 3.2.9-2 1.6-4.1 1.1-5.1-1.7-3.1-2.7-3.8-4.8-6.5-2-2.6-3.4 3.4-12.1-1.8-3.2-1.9-4-5-3.4-7.5-1.6 2.6-1.5 7 2.6 9.4 8.7 5.1 10.1-.8 12.1 1.8 2.1 2.8 3.1 3.5 4.8 6.5"/><path d="m55.6 24.9c5.5 3.3 3.6 18.4-1.5 25.2-8 10.7-18.5 10.6-29 8.5 0 0-12.7 3.5-20.1-8.5 4.6 12.7 20.1 10.1 20.1 10.1 11.1 3.4 21.9 2.6 30.4-8.4 5.5-7 8.8-24.1.1-26.9"/></g></svg>
\ No newline at end of file
+<?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:#845636;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:#af7e57;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:#af7e57;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:#af7e57;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:#af7e57;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:#af7e57;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>