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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f387.svg b/public/emoji/1f387.svg
index 201422523..3e81c5c2d 100644
--- a/public/emoji/1f387.svg
+++ b/public/emoji/1f387.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" enable-background="new 0 0 64 64"><path fill="#3e4347" d="m0 0h64v64h-64z"/><path fill="#d0d0d0" d="m30.9 32h2.2v32h-2.2z"/><path fill="#ffdd7d" d="m32 3.2l3 19.7 13.9-14.2-9.1 17.7 19.6-3.3-17.8 8.9 17.8 8.9-19.6-3.3 9.1 17.7-13.9-14.2-3 19.7-3-19.7-13.9 14.2 9.1-17.7-19.6 3.3 17.8-8.9-17.8-8.9 19.6 3.3-9.1-17.7 13.9 14.2z"/><path fill="#ffce31" d="m25.3 52.5l2.5-14.7-13.3 6.9 10.7-10.5-14.8-2.2 14.8-2.2-10.7-10.5 13.3 6.9-2.5-14.7 6.7 13.3 6.7-13.3-2.5 14.7 13.3-6.9-10.7 10.5 14.8 2.2-14.8 2.2 10.7 10.5-13.3-6.9 2.5 14.7-6.7-13.3z"/><path fill="#fff" d="m41.5 18.9l-5.1 9.9 11-1.8-10 5 10 5-11-1.8 5.1 9.9-7.8-8-1.7 11.1-1.7-11.1-7.8 8 5.1-9.9-11 1.8 10-5-10-5 11 1.8-5.1-9.9 7.8 8 1.7-11.1 1.7 11.1z"/></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(36,32)" id="g20"><path id="path22" style="fill:#226699;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><g transform="translate(17,15)" id="g24"><path id="path26" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 Z"/></g><g transform="translate(18,16.0005)" id="g28"><path id="path30" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.419,0 -0.809,-0.265 -0.949,-0.684 l -3,-9 c -0.175,-0.524 0.109,-1.09 0.633,-1.265 0.525,-0.177 1.09,0.109 1.265,0.632 l 3,9 C 1.123,-0.793 0.84,-0.227 0.316,-0.052 0.211,-0.017 0.105,0 0,0"/></g><g transform="translate(18.0005,16.0005)" id="g32"><path id="path34" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.087,0 -0.175,-0.012 -0.263,-0.036 -0.796,-0.181 -1.11,-0.73 -0.965,-1.263 L 2.261,-13.12 c 0.146,-0.532 0.697,-0.845 1.228,-0.702 0.533,0.145 0.847,0.695 0.702,1.228 L 0.964,-0.738 C 0.843,-0.293 0.44,0 0,0"/></g><g transform="translate(17.9995,16)" id="g36"><path id="path38" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.218,0 -0.437,-0.071 -0.621,-0.216 l -13.25,-10.5 c -0.432,-0.343 -0.505,-0.972 -0.162,-1.405 0.343,-0.433 0.972,-0.505 1.405,-0.163 l 13.25,10.5 c 0.432,0.343 0.506,0.972 0.162,1.405 C 0.587,-0.13 0.295,0 0,0"/></g><g transform="translate(18.0015,16)" id="g40"><path id="path42" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.039,0 -0.077,-0.002 -0.116,-0.006 l -12.333,-1.417 c -0.548,-0.063 -0.942,-0.559 -0.879,-1.108 0.063,-0.549 0.565,-0.944 1.108,-0.879 l 12.333,1.416 c 0.548,0.063 0.942,0.559 0.879,1.108 C 0.934,-0.376 0.501,0 0,0"/></g><g transform="translate(3.5005,22.917)" id="g44"><path id="path46" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.373,0 -0.731,-0.21 -0.903,-0.569 -0.238,-0.499 -0.027,-1.096 0.472,-1.333 l 14.5,-6.917 c 0.497,-0.24 1.095,-0.027 1.333,0.471 0.238,0.499 0.027,1.096 -0.472,1.333 L 0.43,-0.098 C 0.291,-0.031 0.145,0 0,0"/></g><g transform="translate(7.3325,31.167)" id="g48"><path id="path50" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.199,0 -0.399,-0.059 -0.574,-0.182 -1.026,-0.5 -1.135,-1.123 -0.817,-1.575 L 9.85,-16.742 c 0.317,-0.452 0.941,-0.561 1.393,-0.243 0.452,0.317 0.56,0.941 0.242,1.393 L 0.819,-0.425 C 0.625,-0.148 0.314,0 0,0"/></g><g transform="translate(18.0005,16)" id="g52"><path id="path54" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.276,0 -0.551,-0.114 -0.749,-0.337 -0.366,-0.413 -0.328,-1.045 0.085,-1.412 l 11.708,-10.375 c 0.414,-0.365 1.045,-0.328 1.412,0.086 0.366,0.413 0.328,1.045 -0.085,1.412 L 0.663,-0.251 C 0.472,-0.083 0.236,0 0,0"/></g><g transform="translate(18,16.0005)" id="g56"><path id="path58" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.419,0 -0.81,-0.266 -0.949,-0.686 -0.174,-0.525 0.111,-1.09 0.635,-1.264 l 12.333,-4.083 c 0.528,-0.175 1.09,0.112 1.263,0.635 0.174,0.524 -0.11,1.09 -0.634,1.264 L 0.314,-0.051 C 0.21,-0.017 0.104,0 0,0"/></g><g transform="translate(31.835,17.5)" id="g60"><path id="path62" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.036,0 -0.072,-0.002 -0.108,-0.006 l -13.835,-1.5 c -0.549,-0.059 -0.946,-0.553 -0.886,-1.102 0.06,-0.549 0.558,-0.944 1.102,-0.886 l 13.833,1.5 c 0.55,0.059 0.947,0.553 0.887,1.102 C 0.937,-0.38 0.504,0 0,0"/></g><g transform="translate(18,15)" id="g64"><path id="path66" style="fill:none;stroke:#ffcc4d;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" d="M 0,0 8.917,6.5"/></g><g transform="translate(18,15)" id="g68"><path id="path70" style="fill:none;stroke:#ffcc4d;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" d="M 0,0 7.834,13"/></g><g transform="translate(20,36)" id="g72"><path id="path74" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4,0 0,-19 c 0,-1.104 0.896,-2 2,-2 1.105,0 2,0.896 2,2 L 0,0 Z"/></g><g transform="translate(21,15)" id="g76"><path id="path78" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.657 -1.343,3 -3,3 -1.657,0 -3,-1.343 -3,-3 0,-1.657 1.343,-3 3,-3 1.657,0 3,1.343 3,3"/></g><g transform="translate(6.9629,4.3057)" id="g80"><path id="path82" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.303 -1.057,2.359 -2.359,2.359 -1.304,0 -2.36,-1.056 -2.36,-2.359 0,-1.303 1.056,-2.359 2.36,-2.359 C -1.057,-2.359 0,-1.303 0,0"/></g><g transform="translate(32.666,4.625)" id="g84"><path id="path86" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.634 -1.324,2.958 -2.958,2.958 -1.634,0 -2.958,-1.324 -2.958,-2.958 0,-1.634 1.324,-2.958 2.958,-2.958 C -1.324,-2.958 0,-1.634 0,0"/></g><g transform="translate(22.833,3.144)" id="g88"><path id="path90" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0.887 -0.719,1.606 -1.606,1.606 -0.887,0 -1.606,-0.719 -1.606,-1.606 0,-0.887 0.719,-1.606 1.606,-1.606 C -0.719,-1.606 0,-0.887 0,0"/></g><g transform="translate(4.8271,22.083)" id="g92"><path id="path94" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.967 -0.784,1.75 -1.75,1.75 -2.716,1.75 -3.5,0.967 -3.5,0 c 0,-0.967 0.784,-1.75 1.75,-1.75 C -0.784,-1.75 0,-0.967 0,0"/></g><g transform="translate(9.75,30.833)" id="g96"><path id="path98" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.565 -1.269,2.833 -2.833,2.833 -1.565,0 -2.834,-1.268 -2.834,-2.833 0,-1.564 1.269,-2.833 2.834,-2.833 C -1.269,-2.833 0,-1.564 0,0"/></g><g transform="translate(34.334,16.5835)" id="g100"><path id="path102" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.22 -0.989,2.209 -2.209,2.209 -3.428,2.209 -4.417,1.22 -4.417,0 c 0,-1.22 0.989,-2.208 2.208,-2.208 C -0.989,-2.208 0,-1.22 0,0"/></g><g transform="translate(27.667,28)" id="g104"><path id="path106" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.967 -0.783,1.75 -1.75,1.75 -2.717,1.75 -3.5,0.967 -3.5,0 c 0,-0.967 0.783,-1.75 1.75,-1.75 C -0.783,-1.75 0,-0.967 0,0"/></g></g></g></g></svg>