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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f1f0-1f1ee.svg b/public/emoji/1f1f0-1f1ee.svg
index 81f5fc9e5..4ff9bc263 100644
--- a/public/emoji/1f1f0-1f1ee.svg
+++ b/public/emoji/1f1f0-1f1ee.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" enable-background="new 0 0 64 64"><path d="m17.6 39c6.9 0 6.9-2 13.7-2s6.9 2 13.7 2c6.8 0 6.8-2 13.7-2 1.1 0 2 .1 2.8.1.3-1.7.5-3.4.5-5.2 0-16.5-13.4-29.9-30-29.9s-30 13.4-30 30c0 1.7.2 3.4.4 5.1.5 0 1 0 1.5 0 6.9-.1 6.9 1.9 13.7 1.9" fill="#ed4c5c"/><g fill="#ffce31"><path d="m44.3 33l3.7-1.7-4-.8 3.3-2.4-4.1-.1 2.7-3-3.9.8 2-3.5-3.8 1.6 1.3-3.8-3.3 2.3.3-4-2.7 3-.5-4-2 3.4-1.3-3.8-1.3 3.8-2-3.4-.5 4-2.7-3 .4 4-3.4-2.3 1.3 3.8-3.8-1.6 2 3.5-3.9-.8 2.7 3-4.1.1 3.3 2.4-4 .8 3.7 1.7-3.7 1.7 4 .8-3.3 2.4 4.1.1-2.7 3 6.2-1.3-1.5-2.6-.7-2-.2-2.1.2-2.1.7-2 1-1.8 1.4-1.6 1.7-1.2 2-.9 2-.4h2.2l2 .4 1.9.9 1.8 1.2 1.4 1.6 1 1.8.7 2 .2 2.1-.2 2.1-.7 2-1.5 2.6 6.2 1.3-2.7-3 4.1-.1-3.3-2.4 4-.8z"/><circle cx="32" cy="33" r="12"/></g><path d="m32 43c-5.5 0-10-4.5-10-10s4.5-10 10-10 10 4.5 10 10-4.5 10-10 10m0-18c-4.4 0-8 3.6-8 8 0 4.4 3.6 8 8 8s8-3.6 8-8c0-4.4-3.6-8-8-8" fill="#f27a52"/><path d="m43.1 9.3c-1.5 1.1-1.4 1.4-7.3 1.4-2.1 0-3.2.3-3.8.8-.6-.4-1.7-.8-3.8-.8-5.9 0-5.7-.4-7.3-1.4-2-1.4-.7 2.8 4.8 2.8 2.3 0 4.1.4 5.3.8-3.4.2-6 1.1-6 1.1s3.1 1.1 7 1.1 7-1.1 7-1.1-2.6-.9-6-1.1c1.2-.4 3-.8 5.3-.8 5.5-.1 6.8-4.2 4.8-2.8" fill="#ffce31"/><g fill="#428bc1"><path d="m31.3 49c-6.8 0-6.8 2-13.7 2-5.4 0-6.6-1.2-10.2-1.8 1.3 1.9 2.8 3.6 4.5 5.1 1.4.4 3 .7 5.6.7 6.9 0 6.9-2 13.7-2s6.9 2 13.7 2c3.9 0 5.6-.6 7.6-1.2 1.5-1.4 2.9-3 4.1-4.7-4.8.3-5.5 1.9-11.6 1.9-6.8 0-6.8-2-13.7-2"/><path d="m31.3 57c-6.4 0-6.8 1.7-12.5 2 4 1.9 8.4 3 13.2 3 4.7 0 9.2-1.1 13.1-3 0 0-.1 0-.1 0-6.8 0-6.8-2-13.7-2"/><path d="m58.7 41c-6.9 0-6.9 2-13.7 2-6.8 0-6.8-2-13.7-2s-6.8 2-13.7 2c-6.8 0-6.8-2-13.7-2-.2 0-.4 0-.5 0 .4 1.4 1 2.7 1.6 4 5.8.2 6.2 2 12.7 2 6.9 0 6.9-2 13.7-2s6.9 2 13.7 2c6.8 0 6.8-2 13.7-2 .1 0 .2 0 .3 0 .6-1.3 1.1-2.6 1.6-4-.7 0-1.3 0-2 0"/></g><g fill="#fff"><path d="m17.6 43c6.8 0 6.8-2 13.7-2 6.8 0 6.8 2 13.7 2 6.9 0 6.9-2 13.7-2 .7 0 1.3 0 1.9.1.4-1.3.7-2.6.9-3.9-.8-.1-1.7-.1-2.8-.1-6.8 0-6.8 2-13.7 2-6.8 0-6.8-2-13.7-2s-6.9 2-13.7 2c-6.8 0-6.8-2-13.7-2-.5 0-1 0-1.5 0 .3 1.3.6 2.6 1 3.9.2 0 .3 0 .5 0 6.9 0 6.9 2 13.7 2"/><path d="m45 47c-6.8 0-6.8-2-13.7-2s-6.9 2-13.7 2c-6.5 0-6.9-1.8-12.7-2 .7 1.5 1.5 2.9 2.5 4.2 3.6.5 4.8 1.8 10.2 1.8 6.8 0 6.8-2 13.7-2 6.8 0 6.8 2 13.7 2 6.1 0 6.8-1.6 11.7-1.9.9-1.3 1.7-2.6 2.4-4-.1 0-.2 0-.3 0-6.9-.1-6.9 1.9-13.8 1.9"/><path d="m31.3 53c-6.9 0-6.9 2-13.7 2-2.6 0-4.2-.3-5.6-.7 2 1.8 4.3 3.4 6.8 4.6 5.6-.2 6.1-2 12.5-2 6.8 0 6.8 2 13.7 2 0 0 .1 0 .1 0 2.8-1.3 5.3-3.1 7.5-5.2-2 .6-3.7 1.2-7.6 1.2-6.8.1-6.8-1.9-13.7-1.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(36,9)" id="g20"><path id="path22" style="fill:#eeeeee;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,18 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(32,31)" id="g24"><path id="path26" style="fill:#ce1126;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -28,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-5.696 0,-1.56 0,-0.695 c 0.402,0.213 0.846,0.404 1.636,0.404 1.819,0 1.819,-1 3.637,-1 1.818,0 1.818,1 3.636,1 1.818,0 1.818,-1 3.636,-1 1.819,0 1.819,1 3.637,1 1.818,0 1.818,-1 3.636,-1 1.819,0 1.819,1 3.629,1 1.826,0 1.826,-1 3.64,-1 1.822,0 1.822,1 3.639,1 1.82,0 1.82,-1.016 3.637,-1.016 0.791,0 1.235,0.231 1.637,0.438 l 0,0.869 0,1.076 L 4,-4 C 4,-1.791 2.209,0 0,0"/></g><g transform="translate(20.8779,18.2627)" id="g28"><path id="path30" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.277,0.377 0.663,0.375 1.124,0.135 1.061,0.746 0.331,1.131 0.002,1.184 0.136,1.633 0.567,1.859 1.08,1.792 0.814,2.345 -0.065,2.363 -0.395,2.296 -0.42,2.767 -0.089,3.128 0.413,3.244 -0.02,3.671 -0.854,3.381 -1.142,3.205 -1.321,3.638 -1.135,4.092 -0.699,4.376 -1.251,4.627 -1.938,4.065 -2.148,3.8 -2.465,4.144 -2.44,4.636 -2.128,5.053 -2.731,5.097 -3.187,4.328 -3.294,4.006 -3.708,4.219 -3.852,4.687 -3.701,5.188 -4.281,5.019 -4.449,4.139 -4.442,3.8 -4.901,3.855 -5.195,4.247 -5.222,4.771 -5.71,4.409 -5.572,3.525 -5.45,3.209 -5.901,3.1 -6.309,3.368 -6.51,3.849 -6.848,3.34 -6.42,2.556 -6.199,2.302 -6.587,2.044 -7.059,2.152 -7.411,2.537 -7.557,1.941 -6.891,1.352 -6.598,1.189 -6.874,0.812 -7.042,0.536 -7.502,0.773 -7.438,0.162 -6.927,0.058 -6.597,0.007 L 0,0 Z"/></g><g transform="translate(19.9219,18.8584)" id="g32"><path id="path34" style="fill:#fff100;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 2.266,0.823 -0.138,0.811 1.712,2.374 -0.545,1.525 0.668,3.637 -1.168,2.057 -0.739,4.462 -1.932,2.339 -2.339,4.749 -2.746,2.339 -3.938,4.462 -3.509,2.057 -5.344,3.637 -4.132,1.525 -6.389,2.374 -4.538,0.811 -6.944,0.823 -4.677,0 0,0 Z"/></g><g transform="translate(17.583,16.4795)" id="g36"><path id="path38" style="fill:#fff100;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.291,0 2.339,1.064 2.339,2.377 2.339,3.69 1.291,4.753 0,4.753 -1.292,4.753 -2.339,3.69 -2.339,2.377 -2.339,1.064 -1.292,0 0,0"/></g><g transform="translate(17.583,16.4795)" id="g40"><path id="path42" style="fill:none;stroke:#f15a29;stroke-width:0.06;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,0 C 1.291,0 2.339,1.064 2.339,2.377 2.339,3.69 1.291,4.753 0,4.753 -1.292,4.753 -2.339,3.69 -2.339,2.377 -2.339,1.064 -1.292,0 0,0 Z"/></g><g transform="translate(17.4385,26.4956)" id="g44"><path id="path46" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.187,0.253 -0.421,0.522 -0.702,0.649 -0.28,0.126 -0.782,0.205 -1.324,0.063 -0.608,-0.158 -1.331,-0.403 -1.902,-0.236 -0.109,0.03 -0.187,-0.08 0.032,-0.206 0.218,-0.128 0.771,-0.159 1.324,-0.088 0.39,0.05 0.904,0.032 1.107,-0.047 0.241,-0.095 0.678,-0.42 0.864,-0.753 L 0,0 Z"/></g><g transform="translate(18.6694,25.1182)" id="g48"><path id="path50" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.169,0.067 0.553,0.099 0.708,0.073 0.912,0.039 1.194,0.141 1.287,0.182 1.455,0.257 1.276,0.385 0.624,0.348 0.195,0.325 0.028,0.136 0,0"/></g><g transform="translate(18.2412,24.8252)" id="g52"><path id="path54" style="fill:#fcd116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.395,0.151 0.765,0.666 1.435,0.649 2.073,0.633 2.407,0.839 1.855,0.982 1.302,1.124 0.88,1.069 0.506,0.997 0.025,0.906 -0.468,1.377 -1.2,1.116 -1.495,1.011 -1.894,1.132 -2.081,1.314 -2.292,1.519 -2.576,1.543 -2.782,1.334 -2.821,1.294 -2.868,1.231 -2.997,1.231 c -0.222,0 -0.576,-0.004 -0.581,-0.376 0.118,0.147 0.199,0.17 0.578,0.17 0.058,0 0.128,-0.027 0.187,-0.127 C -2.728,0.752 -2.537,0.637 -2.346,0.633 -2.155,0.629 -2.075,0.5 -1.949,0.364 -1.582,-0.032 -0.764,-0.293 0,0"/></g><g transform="translate(16.6274,25.7832)" id="g56"><path id="path58" style="fill:#fcd116;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.02,-0.201 0.339,-0.401 0.452,-0.444 0.149,-0.055 0.28,-0.015 0.312,0.127 0.109,-0.095 0.288,-0.008 0.288,0.111 0.102,-0.047 0.242,0.016 0.265,0.158 C 1.442,-0.08 1.566,-0.016 1.55,0.079 1.691,0.024 1.8,0.067 1.824,0.162 1.921,0.126 2.069,0.186 2.101,0.289 2.197,0.249 2.341,0.305 2.379,0.399 2.506,0.353 2.638,0.388 2.697,0.502 2.782,0.451 2.93,0.507 2.954,0.625 3.04,0.57 3.172,0.578 3.204,0.705 3.313,0.629 3.445,0.688 3.438,0.815 c 0.05,-0.023 0.154,0 0.163,0.08 0.202,-0.009 0.459,0 0.459,0.15 0.172,-0.008 0.413,0.07 0.408,0.256 0.12,0.008 0.273,0.102 0.309,0.235 C 4.809,1.645 4.684,1.715 4.466,1.726 3.118,1.789 2.775,1.512 2.12,1.457 1.522,1.406 1.146,1.225 0.842,0.871 0.569,0.554 0.298,0.266 0.148,0.166 0.059,0.106 0.004,0.039 0,0"/></g><path id="path60" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 20,16 -5,0 0,2 5,0 0,-2 z"/><g transform="translate(35.9258,8.2666)" id="g62"><path id="path64" style="fill:#00247d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.384,-0.211 -0.818,-0.314 -1.562,-0.314 -1.818,0 -1.818,0.985 -3.636,0.985 -1.819,0 -1.819,-1 -3.694,-1 -1.761,0 -1.761,1 -3.608,1 -1.789,0 -1.789,-1 -3.607,-1 -1.819,0 -1.819,1 -3.637,1 -1.818,0 -1.818,-1 -3.636,-1 -1.819,0 -1.819,1 -3.637,1 -1.818,0 -1.818,-1 -3.636,-1 -1.818,0 -1.818,1 -3.637,1 -0.762,0 -1.2,-0.178 -1.591,-0.383 0.224,-1.996 1.899,-3.555 3.955,-3.555 l 28,0 c 1.958,0 3.581,1.409 3.926,3.267"/></g><g transform="translate(36,10.6172)" id="g66"><path id="path68" style="fill:#00247d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,1.944 C -0.402,1.717 -0.846,1.57 -1.637,1.57 c -1.817,0 -1.817,1.007 -3.635,1.007 -1.819,0 -1.819,-1 -3.694,-1 -1.761,0 -1.761,1 -3.608,1 -1.789,0 -1.789,-1 -3.608,-1 -1.818,0 -1.818,1 -3.636,1 -1.818,0 -1.818,-1 -3.637,-1 -1.818,0 -1.818,1 -3.636,1 -1.818,0 -1.818,-1 -3.636,-1 -1.818,0 -1.818,1 -3.637,1 -0.79,0 -1.234,-0.19 -1.636,-0.404 l 0,-2 c 0.402,0.214 0.846,0.404 1.636,0.404 1.819,0 1.819,-1 3.637,-1 1.818,0 1.818,1 3.636,1 1.818,0 1.818,-1 3.636,-1 1.819,0 1.819,1 3.637,1 1.818,0 1.818,-1 3.636,-1 1.819,0 1.819,1 3.629,1 1.826,0 1.826,-1 3.64,-1 1.822,0 1.822,1 3.639,1 2.378,0 2.323,-0.991 3.637,-0.991 0.791,0 1.235,0.207 1.637,0.414"/></g><g transform="translate(36,14.874)" id="g70"><path id="path72" style="fill:#00247d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,1.944 C -0.402,1.717 -0.846,1.579 -1.637,1.579 c -1.817,0 -1.817,0.999 -3.635,0.999 -1.819,0 -1.819,-1.001 -3.694,-1.001 -1.761,0 -1.761,1.001 -3.608,1.001 -1.789,0 -1.789,-1.001 -3.608,-1.001 -1.818,0 -1.818,1.001 -3.636,1.001 -1.818,0 -1.818,-1.001 -3.637,-1.001 -1.818,0 -1.818,1.001 -3.636,1.001 -1.818,0 -1.818,-1.001 -3.636,-1.001 -1.818,0 -1.818,1.001 -3.637,1.001 -0.79,0 -1.234,-0.191 -1.636,-0.405 l 0,-2 c 0.402,0.214 0.846,0.404 1.636,0.404 1.819,0 1.819,-1 3.637,-1 1.818,0 1.818,1 3.636,1 1.818,0 1.818,-1 3.636,-1 1.819,0 1.819,1 3.637,1 1.818,0 1.818,-1 3.636,-1 1.819,0 1.819,1 3.629,1 1.826,0 1.826,-1 3.64,-1 1.822,0 1.822,1 3.639,1 1.82,0 1.82,-0.969 3.637,-0.969 0.791,0 1.235,0.185 1.637,0.392"/></g><g transform="translate(36,16.875)" id="g74"><path id="path76" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,1.979 c -0.402,-0.228 -0.846,-0.43 -1.637,-0.43 -1.817,0 -1.817,1.063 -3.635,1.063 -1.819,0 -1.819,-1.001 -3.694,-1.001 -1.761,0 -1.761,1.001 -3.608,1.001 -1.789,0 -1.789,-1.001 -3.608,-1.001 -1.818,0 -1.818,1.001 -3.636,1.001 -1.818,0 -1.818,-1.001 -3.637,-1.001 -1.818,0 -1.818,1.001 -3.636,1.001 -1.818,0 -1.818,-1.001 -3.636,-1.001 -1.818,0 -1.818,1.001 -3.637,1.001 -0.79,0 -1.234,-0.191 -1.636,-0.404 l 0,-2 c 0.402,0.212 0.846,0.404 1.636,0.404 1.819,0 1.819,-1.001 3.637,-1.001 1.818,0 1.818,1.001 3.636,1.001 1.818,0 1.818,-1.001 3.636,-1.001 1.819,0 1.819,1.001 3.637,1.001 1.818,0 1.818,-1.001 3.636,-1.001 1.819,0 1.819,1.001 3.629,1.001 1.826,0 1.826,-1.001 3.64,-1.001 1.822,0 1.822,1.001 3.639,1.001 1.82,0 1.82,-0.987 3.637,-0.987 0.791,0 1.235,0.168 1.637,0.375"/></g></g></g></g></svg>