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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/3299.svg b/public/emoji/3299.svg
index 3e750322e..ffe9e7757 100644
--- a/public/emoji/3299.svg
+++ b/public/emoji/3299.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" enable-background="new 0 0 64 64"><circle cx="32" cy="32" r="30" fill="#ff5a79"/><g fill="#fff"><path d="m25.8 37.5c-.3-.7-.8-1.6-1.4-2.6v15.1h-4.4v-13.5c-1.2 3-2.5 5.7-4 7.6-.4-1.4-1.4-3.6-2.1-4.9 2-2.3 3.9-6.3 5.1-10.1h-4.5v-4.6h5.5v-4.1c-1.5.3-3 .5-4.4.7-.2-1.1-.8-2.7-1.4-3.8 4.1-.6 8.7-1.6 11.4-3l3.2 3.7c-1.3.6-2.9 1.1-4.4 1.5v5h3.7v4.6h-3.7v.3c.9.9 3 3.2 3.9 4.3.4-2 .7-4.3.8-6.3l3.5.9c-.3 4.4-1 9.5-2.7 12.5l-3.3-1.8c.6-1.2 1.2-2.7 1.5-4.3l-2.3 2.8"/><path d="m45.6 39.6c-.1-2.4-.8-5.7-1.8-8.8-1.7 3.9-3.8 7.3-6.2 10.3v2.5c0 1.5.2 1.7 1.2 1.7h3.2c1 0 1.2-.8 1.4-5.7 1 .8 2.7 1.5 4 1.8-.4 6.4-1.6 8.2-4.9 8.2h-4.3c-3.3 0-4.6-.9-4.9-3.9-1.3 1.1-2.7 2.2-4.1 3.2-.7-.9-2.5-2.7-3.5-3.6 2.9-1.7 5.4-3.8 7.6-6.3v-16.7h4.4v10.6c2.8-4.8 4.8-10.5 6.1-16.9l4.7.9c-.8 3.8-1.9 7.3-3.1 10.5l1.6-.4c1.6 3.5 2.9 8.2 3.2 11.4l-4.6 1.2"/><path d="m39.1 23.2c-1.5-1.8-4.7-4.4-7.4-6l3-3.2c2.7 1.5 6 3.8 7.6 5.7l-3.2 3.5"/></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(36,18)" id="g20"><path id="path22" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-9.94 -8.059,-18 -18,-18 -9.941,0 -18,8.06 -18,18 0,9.941 8.059,18 18,18 C -8.059,18 0,9.941 0,0"/></g><g transform="translate(27.9023,20.9565)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.378,0 0.702,-0.216 0.892,-0.648 0.917,-1.943 1.51,-3.914 1.943,-5.911 0.026,-0.136 0.054,-0.27 0.054,-0.378 0,-0.432 -0.19,-0.756 -0.675,-0.918 -0.135,-0.027 -0.27,-0.054 -0.405,-0.054 -0.405,0 -0.729,0.244 -0.864,0.81 -0.431,1.781 -1.052,3.914 -1.863,5.695 -0.08,0.136 -0.107,0.297 -0.107,0.459 0,0.351 0.189,0.675 0.567,0.837 C -0.297,-0.027 -0.135,0 0,0 m -4.453,6.64 c 0.297,-0.27 0.485,-0.594 0.485,-0.917 0,-0.189 -0.053,-0.378 -0.188,-0.54 -0.217,-0.297 -0.567,-0.459 -0.918,-0.459 -0.27,0 -0.513,0.081 -0.701,0.243 -1.108,0.917 -2.944,2.105 -4.401,2.807 -0.297,0.189 -0.486,0.486 -0.486,0.81 0,0.162 0.054,0.351 0.162,0.513 0.216,0.35 0.567,0.512 0.918,0.512 0.189,0 0.378,-0.053 0.567,-0.134 C -7.504,8.8 -5.587,7.639 -4.453,6.64 m -7.153,-6.289 c 0.053,0 0.107,0 0.189,-0.027 0.567,-0.081 0.837,-0.432 0.837,-0.918 0,-0.081 0,-0.162 -0.028,-0.243 -0.27,-2.483 -0.864,-5.102 -1.7,-7.072 -0.216,-0.405 -0.567,-0.621 -0.945,-0.621 -0.135,0 -0.297,0.028 -0.432,0.109 -0.378,0.161 -0.54,0.431 -0.54,0.756 0,0.188 0.054,0.377 0.162,0.593 0.81,1.863 1.35,4.238 1.62,6.64 0.054,0.513 0.351,0.783 0.837,0.783 m 2.294,3.077 c 0,0.486 0.405,0.783 1.026,0.783 0.566,0 0.972,-0.297 0.972,-0.81 l 0,-9.231 c 2.699,3.59 4.587,8.07 5.83,13.307 0.108,0.459 0.405,0.729 0.918,0.729 0.081,0 0.188,0 0.324,-0.027 0.539,-0.108 0.863,-0.54 0.863,-0.972 0,-0.108 0,-0.189 -0.026,-0.27 -1.782,-6.559 -4.482,-11.85 -7.909,-15.71 l 0,-2.725 c 0,-0.649 0.189,-0.919 0.863,-0.999 0.459,-0.054 1.025,-0.082 1.863,-0.082 0.836,0 1.457,0.082 1.916,0.189 0.54,0.136 0.837,0.324 0.998,0.892 0.162,0.566 0.298,1.565 0.324,2.806 0.028,0.432 0.406,0.81 1,0.81 l 0.053,0 C 0.324,-7.909 0.621,-8.26 0.621,-8.854 l 0,-0.081 c -0.054,-1.511 -0.243,-2.807 -0.566,-3.697 -0.325,-0.918 -0.999,-1.486 -2.106,-1.701 -0.702,-0.135 -1.539,-0.189 -2.537,-0.216 -1.08,0 -1.971,0.053 -2.673,0.135 -1.43,0.189 -2.051,0.836 -2.051,2.213 l 0,1.944 c -1.323,-1.215 -2.807,-2.349 -4.373,-3.293 -0.243,-0.162 -0.486,-0.243 -0.702,-0.243 -0.323,0 -0.621,0.162 -0.782,0.512 -0.136,0.162 -0.189,0.378 -0.189,0.568 0,0.35 0.162,0.701 0.539,0.918 2.025,1.132 3.861,2.618 5.507,4.291 l 0,10.932 z m -4.589,-0.54 c 0.486,0 0.756,-0.351 0.756,-0.89 0,-0.567 -0.27,-0.945 -0.756,-0.945 l -2.456,0 c 0.621,-1.431 1.511,-2.726 2.483,-3.698 0.189,-0.189 0.297,-0.486 0.297,-0.756 0,-0.243 -0.081,-0.459 -0.216,-0.621 -0.162,-0.188 -0.378,-0.297 -0.62,-0.297 -0.244,0 -0.541,0.135 -0.73,0.378 -0.54,0.702 -1.16,1.862 -1.619,3.104 0.162,-1.403 0.297,-2.915 0.297,-4.102 l 0,-9.61 c 0,-0.513 -0.351,-0.81 -0.972,-0.81 -0.594,0 -0.917,0.297 -0.917,0.81 l 0,8.907 c 0,1.404 0.215,2.943 0.404,4.211 -0.674,-2.24 -1.808,-5.047 -3.185,-6.937 -0.216,-0.296 -0.513,-0.459 -0.837,-0.459 -0.189,0 -0.378,0.054 -0.54,0.189 -0.27,0.217 -0.404,0.486 -0.404,0.783 0,0.216 0.081,0.432 0.243,0.647 1.835,2.295 3.266,5.481 3.994,8.261 l -2.915,0 c -0.486,0 -0.756,0.378 -0.756,0.945 0,0.539 0.27,0.89 0.756,0.89 l 3.24,0 0,3.51 c -0.837,-0.189 -1.701,-0.352 -2.484,-0.459 -0.054,-0.027 -0.108,-0.027 -0.189,-0.027 -0.459,0 -0.81,0.269 -0.891,0.836 l 0,0.162 c 0,0.486 0.297,0.837 0.729,0.918 2.213,0.297 4.643,0.945 6.262,1.781 0.217,0.108 0.432,0.163 0.648,0.163 0.351,0 0.648,-0.189 0.864,-0.486 0.135,-0.189 0.189,-0.378 0.189,-0.567 0,-0.324 -0.189,-0.594 -0.54,-0.756 -0.755,-0.378 -1.7,-0.729 -2.699,-1.053 l 0,-4.022 2.564,0 z"/></g></g></g></g></svg>