diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:05:29 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:13:59 +0200 |
commit | d392020da6ff4511a2925b327de23933f374bea3 (patch) | |
tree | e86a590276a96ef72d5ed49f79998e7680969cb6 /public/emoji/1f46e-1f3ff-200d-2642-fe0f.svg | |
parent | c699b2d141d7aa910bd81ae5fe881ecec7039395 (diff) | |
parent | 1ca4e51eb38de6de81cedf3ddcdaa626f1d1c569 (diff) |
Merge branch 'master' into glitch-soc/tentative-merge
Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.
Diffstat (limited to 'public/emoji/1f46e-1f3ff-200d-2642-fe0f.svg')
-rw-r--r-- | public/emoji/1f46e-1f3ff-200d-2642-fe0f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f46e-1f3ff-200d-2642-fe0f.svg b/public/emoji/1f46e-1f3ff-200d-2642-fe0f.svg index f6c19165a..440cb510f 100644 --- a/public/emoji/1f46e-1f3ff-200d-2642-fe0f.svg +++ b/public/emoji/1f46e-1f3ff-200d-2642-fe0f.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,0 36,0 36,36 0,36 0,0 Z"/></clipPath><clipPath id="clipPath108" clipPathUnits="userSpaceOnUse"><path id="path110" 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(32,0)" id="g20"><path id="path22" style="fill:#2a6797;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,2 c 0,3.314 -2.686,6 -6,6 l -16,0 c -3.313,0 -6,-2.686 -6,-6 l 0,-2 28,0 z"/></g><g transform="translate(30,28.4995)" id="g24"><path id="path26" style="fill:#2a6797;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.143 -5.372,-7.499 -12,-7.499 -6.626,0 -11.999,3.356 -11.999,7.499 0,4.142 5.373,7.5 11.999,7.5 C -5.372,7.5 0,4.142 0,0"/></g><g transform="translate(13.6396,7.8994)" id="g28"><path id="path30" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.744,-1.268 2.848,-1.963 4.36,-1.963 1.512,0 2.616,0.696 4.36,1.963 l 0,3.811 L 0,3.811 0,0 Z"/></g><g transform="translate(13.6318,10.0273)" id="g32"><path id="path34" style="fill:#664131;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.216,-1.374 2.724,-1.746 4.364,-1.746 1.639,0 3.147,0.373 4.364,1.746 l 0,3.491 L 0,3.491 0,0 Z"/></g><g transform="translate(11.4443,20.0645)" id="g36"><path id="path38" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.734,-2.622 -1.639,-2.622 -0.905,0 -1.639,1.174 -1.639,2.622 0,1.448 0.734,2.623 1.639,2.623 C -0.734,2.623 0,1.448 0,0"/></g><g transform="translate(27.833,20.0645)" id="g40"><path id="path42" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.733,-2.622 -1.639,-2.622 -0.905,0 -1.638,1.174 -1.638,2.622 0,1.448 0.733,2.623 1.638,2.623 C -0.733,2.623 0,1.448 0,0"/></g><g transform="translate(9.4775,19.0405)" id="g44"><path id="path46" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.589 3.816,10.121 8.523,10.121 4.707,0 8.522,-4.532 8.522,-10.121 0,-5.589 -3.815,-10.121 -8.522,-10.121 C 3.816,-10.121 0,-5.589 0,0"/></g><g transform="translate(18,12.1982)" id="g48"><path id="path50" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.754,0 -3.6,0.705 -3.741,0.848 -0.256,0.256 -0.256,0.671 0,0.927 0.248,0.248 0.645,0.254 0.902,0.023 C -2.787,1.761 -2.118,1.311 0,1.311 c 2.2,0 2.836,0.485 2.842,0.49 C 3.098,2.056 3.499,2.044 3.755,1.786 4.011,1.53 3.997,1.104 3.741,0.848 3.6,0.705 2.754,0 0,0"/></g><g transform="translate(18,31.5942)" id="g52"><path id="path54" style="fill:#0b0200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 5.648,0 9.178,-3.242 9.178,-6.715 0,-3.473 -0.706,-4.863 -1.412,-3.473 -0.706,1.389 -1.412,2.778 -1.412,2.778 0,0 -4.236,0 -5.648,1.39 0,0 2.118,-4.168 -2.118,0 0,0 0.706,-2.779 -3.53,0.694 0,0 -2.118,-1.389 -2.824,-4.862 -0.196,-0.964 -1.412,0 -1.412,3.473 C -9.178,-3.242 -6.354,0 0,0"/></g><g transform="translate(14,19)" id="g56"><path id="path58" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.55,0 -1,0.45 -1,1 l 0,1 C -1,2.55 -0.55,3 0,3 0.55,3 1,2.55 1,2 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(22,19)" id="g60"><path id="path62" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.55,0 -1,0.45 -1,1 l 0,1 C -1,2.55 -0.55,3 0,3 0.55,3 1,2.55 1,2 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(18.75,16.25)" id="g64"><path id="path66" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.5,0 c -0.413,0 -0.75,0.337 -0.75,0.75 0,0.413 0.337,0.75 0.75,0.75 L 0,1.5 C 0.413,1.5 0.75,1.163 0.75,0.75 0.75,0.337 0.413,0 0,0"/></g><g transform="translate(8.5,27)" id="g68"><path id="path70" style="fill:#2a6797;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.105 4.253,2 9.5,2 14.747,2 19,1.105 19,0 19,-1.105 14.747,-2 9.5,-2 4.253,-2 0,-1.105 0,0"/></g><g transform="translate(27.001,27)" id="g72"><path id="path74" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -18,0 0,2.999 c 0,0 3.75,2.25 8.999,2.25 C -3.75,5.249 0,2.999 0,2.999 L 0,0 Z"/></g><g transform="translate(27.5,27)" id="g76"><path id="path78" style="fill:#fdcb58;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -19,0 c -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 L 0,1 C 0.275,1 0.5,0.775 0.5,0.5 0.5,0.225 0.275,0 0,0"/></g><g transform="translate(18.001,5.1221)" id="g80"><path id="path82" style="fill:#193d59;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 3.381,-2.494 4.093,-2.778 4.249,-2.841 3.727,0.878 3.727,0.878 l -7.455,0 c 0,0 -0.523,-3.781 -0.231,-3.625 C -3.32,-2.404 0,0 0,0"/></g><g transform="translate(19.3125,2.5625)" id="g84"><path id="path86" style="fill:#193d59;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.375,0.625 0.531,0.906 0.183,0.329 0.453,1.571 0.453,1.571 l -2.187,0.961 c 0,0.007 -0.16,-0.005 -0.16,-0.005 L -1.547,3.391 -1.719,3.328 C -1.936,3.258 -1.625,3.32 -1.625,3.313 L -3.599,2.477 c 0,0 0.288,-1.242 0.47,-1.571 C -2.973,0.625 -2.601,0 -2.601,0 c 0,0 -0.753,-0.562 -1.035,-2.563 l 2.325,0 0.019,0 2.323,0 C 0.75,-0.969 0,0 0,0"/></g><g transform="translate(13.2915,9.375)" id="g88"><path id="path90" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.566,-0.566 4.71,-3.383 4.71,-3.383 0,0 -2.127,-1.242 -4.085,-3.534 -0.197,-0.23 -1.542,4.625 -1.583,5.709 C -0.97,-0.905 -0.271,0.271 0,0"/></g><g transform="translate(22.7305,9.375)" id="g92"><path id="path94" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.566,-0.566 -4.709,-3.383 -4.709,-3.383 0,0 2.126,-1.242 4.084,-3.534 0.196,-0.23 1.542,4.625 1.583,5.709 C 0.97,-0.905 0.271,0.271 0,0"/></g><g transform="translate(18.0156,5.3125)" id="g96"><path id="path98" style="fill:#1e4b6e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.39,0.022 1.543,-0.771 1.422,-1.25 0.961,-3.077 0.573,-2.641 0.031,-2.641 c -0.611,0 -0.964,-0.472 -1.39,1.313 C -1.452,-0.941 -0.562,-0.031 0,0"/></g><g transform="translate(20.0469,0)" id="g100"><path id="path102" style="fill:#1e4b6e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.023,0 c 0,0 0.541,2.167 2.018,2.167 C -0.528,2.167 0,0 0,0"/></g></g></g><g id="g104"><g clip-path="url(#clipPath108)" id="g106"><g transform="translate(20.25,34.499)" id="g112"><path id="path114" style="fill:#fdcb58;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.001,-0.001 -0.002,-0.001 l 0,0.001 0,-0.001 c -0.233,0 -0.434,-0.114 -0.57,-0.282 -0.282,-0.069 -0.667,-0.084 -1.157,0.071 C -1.865,-0.082 -2.047,0 -2.25,0 c -0.201,0 -0.384,-0.082 -0.519,-0.212 -0.491,-0.155 -0.876,-0.14 -1.157,-0.071 -0.137,0.168 -0.338,0.282 -0.571,0.282 l 0,0.001 0,-0.001 c 0,0 -0.001,0.001 -0.002,0.001 -0.415,0 -0.75,-0.335 -0.75,-0.75 0,-0.414 0.335,-0.75 0.75,-0.75 l 10e-4,0 0.001,0 c 0,-3 1.498,-3.75 2.247,-3.75 0.751,0 2.248,0.75 2.248,3.75 L 0,-1.5 c 0.416,0 0.751,0.336 0.751,0.75 C 0.751,-0.335 0.416,0 0,0"/></g><g transform="translate(11.4683,6.5879)" id="g116"><path id="path118" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5.926,-0.938 c -0.272,-0.043 -0.529,0.143 -0.572,0.416 l -0.157,0.988 c -0.043,0.27 0.144,0.528 0.416,0.571 l 5.927,0.939 C -0.041,2.019 0.217,1.831 0.26,1.561 L 0.416,0.572 C 0.459,0.301 0.271,0.044 0,0"/></g><g transform="translate(11.2017,7.4863)" id="g120"><path id="path122" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.318 -0.258,-0.576 -0.577,-0.576 -0.319,0 -0.576,0.258 -0.576,0.576 0,0.319 0.257,0.577 0.576,0.577 C -0.258,0.577 0,0.319 0,0"/></g><g transform="translate(24.5439,6.5879)" id="g124"><path id="path126" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 5.926,-0.938 c 0.272,-0.043 0.529,0.143 0.572,0.416 L 6.655,0.466 C 6.698,0.736 6.512,0.994 6.239,1.037 L 0.312,1.976 C 0.041,2.019 -0.217,1.831 -0.26,1.561 L -0.416,0.572 C -0.459,0.301 -0.271,0.044 0,0"/></g><g transform="translate(24.6152,7.4863)" id="g128"><path id="path130" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.318 0.258,-0.576 0.576,-0.576 0.319,0 0.576,0.258 0.576,0.576 0,0.319 -0.257,0.577 -0.576,0.577 C 0.258,0.577 0,0.319 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#2A6797" d="M32 36v-2c0-3.314-2.685-6-6-6H10c-3.313 0-6 2.686-6 6v2h28z"/><ellipse fill="#2A6797" cx="18.003" cy="7.501" rx="12" ry="7.5"/><path fill="#7C533E" d="M13.64 28.101s2.848 1.963 4.36 1.963c1.512 0 4.359-1.963 4.359-1.963V24.29h-8.72v3.811z"/><path fill="#664131" d="M13.632 25.973c1.216 1.374 2.724 1.746 4.364 1.746 1.639 0 3.146-.373 4.363-1.746v-3.491h-8.728v3.491z"/><path fill="#7C533E" d="M11.444 15.936c0 1.448-.734 2.622-1.639 2.622s-1.639-1.174-1.639-2.622.734-2.623 1.639-2.623c.905-.001 1.639 1.174 1.639 2.623m16.389 0c0 1.448-.733 2.622-1.639 2.622-.905 0-1.639-1.174-1.639-2.622s.733-2.623 1.639-2.623c.906-.001 1.639 1.174 1.639 2.623"/><path fill="#7C533E" d="M9.477 16.959c0-5.589 3.816-10.121 8.523-10.121s8.522 4.532 8.522 10.121S22.707 27.08 18 27.08c-4.707 0-8.523-4.531-8.523-10.121"/><path fill="#3D2E24" d="M18 23.802c-2.754 0-3.6-.705-3.741-.848-.256-.256-.256-.671 0-.927.248-.248.646-.255.902-.023.052.037.721.487 2.839.487 2.2 0 2.836-.485 2.842-.49.256-.255.657-.243.913.015.256.256.242.683-.014.938-.141.143-.987.848-3.741.848"/><path fill="#0B0200" d="M18 4.406c5.648 0 9.178 3.242 9.178 6.715s-.706 4.863-1.412 3.473l-1.412-2.778s-4.235 0-5.647-1.39c0 0 2.118 4.168-2.118 0 0 0 .706 2.779-3.53-.694 0 0-2.118 1.389-2.824 4.862-.196.964-1.412 0-1.412-3.473C8.822 7.648 11.646 4.406 18 4.406"/><path d="M14 17c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1m8 0c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1"/><path fill="#3D2E24" d="M18.75 19.75h-1.5c-.413 0-.75-.337-.75-.75s.337-.75.75-.75h1.5c.413 0 .75.337.75.75s-.337.75-.75.75"/><path fill="#2A6797" d="M8.5 8v1c0 1.105 4.253 2 9.5 2s9.5-.895 9.5-2V8h-19z"/><path fill="#4289C1" d="M27.001 8V6S23.251 3.75 18 3.75C12.752 3.75 9.002 6 9.002 6v2h17.999z"/><path fill="#FDCB58" d="M27.5 8h-19c-.275 0-.5.225-.5.5s.225.5.5.5h19c.275 0 .5-.225.5-.5s-.225-.5-.5-.5z"/><path fill="#193D59" d="M19.947 32.277c.886.622 1.812 1.245 2.147 1.379.018.007.016-.11.012-.114-1.958-2.292-4.084-3.534-4.084-3.534l.013-.009-.014.001h-.03l.011.008s-2.09 1.225-4.035 3.48c.013.103.037.158.076.137.297-.16 1.175-.766 2.03-1.368.039.112.078.213.112.275.156.281.528.906.528.906s-.753.562-1.035 2.563h4.667c-.281-1.595-1.031-2.563-1.031-2.563s.375-.625.531-.906c.031-.059.066-.151.102-.255z"/><path fill="#4289C1" d="M18.001 30.008s-.01-.006-.011-.008c-.124-.084-4.14-2.817-4.698-3.375-.271-.271-.97.905-.958 1.208.041 1.084 1.386 5.939 1.583 5.709l.049-.054c1.945-2.256 4.035-3.48 4.035-3.48zm.02 0s2.126 1.242 4.084 3.534c.004.005.011-.005.016-.005.237.029 1.527-4.642 1.567-5.704.012-.303-.688-1.479-.958-1.208-.557.557-4.56 3.282-4.696 3.374l-.013.009z"/><path fill="#1E4B6E" d="M18.016 30.688c-.562.031-1.452.941-1.359 1.328.427 1.785.779 1.312 1.391 1.312.542 0 .93.437 1.391-1.391.12-.478-1.034-1.272-1.423-1.249zm.026 3.145c-1.477 0-2.019 2.167-2.019 2.167h4.023c.001 0-.527-2.167-2.004-2.167z"/><path fill="#FDCB58" d="M20.25 1.501h-.002c-.233.001-.433.114-.57.282-.281.069-.667.084-1.157-.071-.136-.129-.318-.211-.521-.211-.201 0-.384.082-.519.212-.491.155-.877.14-1.157.071-.138-.168-.338-.282-.571-.282h-.002c-.415 0-.75.335-.75.75 0 .414.335.75.75.75h.002c0 3 1.498 3.75 2.247 3.75.751 0 2.248-.75 2.248-3.75h.002c.416 0 .751-.336.751-.75 0-.416-.335-.751-.751-.751z"/><path fill="#4289C1" d="M11.468 29.412l-5.926.938c-.272.043-.529-.144-.572-.416l-.157-.988c-.043-.271.144-.528.416-.571l5.926-.938c.271-.043.529.145.572.415l.156.988c.044.271-.143.528-.415.572"/><circle fill="#FFF" cx="10.625" cy="28.513" r=".576"/><path fill="#4289C1" d="M24.544 29.412l5.926.938c.273.043.529-.144.572-.416l.157-.988c.043-.271-.143-.528-.416-.571l-5.927-.938c-.271-.043-.529.145-.572.415l-.156.988c-.043.271.144.528.416.572"/><circle fill="#FFF" cx="25.191" cy="28.513" r=".576"/></svg> \ No newline at end of file |