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/1f468-200d-1f3eb.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/1f468-200d-1f3eb.svg')
-rw-r--r-- | public/emoji/1f468-200d-1f3eb.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f468-200d-1f3eb.svg b/public/emoji/1f468-200d-1f3eb.svg index ff49105fc..95963cfab 100644 --- a/public/emoji/1f468-200d-1f3eb.svg +++ b/public/emoji/1f468-200d-1f3eb.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,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="M 4,34 C 2.895,34 2,33.105 2,32 L 2,32 2,10 C 2,8.896 2.895,8 4,8 l 0,0 22,0 c 1.104,0 2,0.896 2,2 l 0,0 0,22 c 0,1.105 -0.896,2 -2,2 l 0,0 -22,0 z"/></clipPath><clipPath id="clipPath40" clipPathUnits="userSpaceOnUse"><path id="path42" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath64" clipPathUnits="userSpaceOnUse"><path id="path66" d="M 0,0 36,0 36,36 0,36 0,0 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(30,10)" id="g20"><path id="path22" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -22,0 c -2.209,0 -4,1.791 -4,4 l 0,22 c 0,2.209 1.791,4 4,4 l 22,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g transform="translate(28,10)" id="g32"><path id="path34" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -22,0 c -1.104,0 -2,0.896 -2,2 l 0,22 c 0,1.105 0.896,2 2,2 l 22,0 c 1.105,0 2,-0.895 2,-2 L 0,0 Z"/></g></g></g><g id="g36"><g clip-path="url(#clipPath40)" id="g38"><g transform="translate(10.5771,27.2217)" id="g44"><path id="path46" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.352,0 0.624,-0.16 0.624,-0.528 0,-0.367 -0.272,-0.528 -0.576,-0.528 l -2.671,0 c -0.351,0 -0.623,0.161 -0.623,0.528 0,0.168 0.104,0.312 0.184,0.408 0.664,0.791 1.383,1.511 1.991,2.391 0.144,0.208 0.279,0.455 0.279,0.743 0,0.328 -0.248,0.616 -0.575,0.616 -0.92,0 -0.48,-1.295 -1.247,-1.295 -0.384,0 -0.584,0.271 -0.584,0.583 0,1.008 0.895,1.815 1.879,1.815 0.983,0 1.775,-0.648 1.775,-1.663 0,-1.111 -1.24,-2.215 -1.919,-3.07 L 0,0 Z"/></g><g transform="translate(4.0898,22.8281)" id="g48"><path id="path50" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0.288 0.184,0.48 0.479,0.48 0.296,0 0.48,-0.192 0.48,-0.48 l 0,-1.16 1.16,0 c 0.296,0 0.48,-0.191 0.48,-0.479 0,-0.288 -0.184,-0.48 -0.48,-0.48 l -1.16,0 0,-1.159 c 0,-0.288 -0.184,-0.48 -0.48,-0.48 C 0.184,-3.758 0,-3.566 0,-3.278 l 0,1.159 -1.159,0 c -0.296,0 -0.48,0.192 -0.48,0.48 0,0.288 0.184,0.479 0.48,0.479 L 0,-1.16 0,0 Z"/></g><g transform="translate(10.5767,20.2217)" id="g52"><path id="path54" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.352,0 0.623,-0.16 0.623,-0.528 0,-0.367 -0.271,-0.528 -0.575,-0.528 l -2.671,0 c -0.351,0 -0.623,0.161 -0.623,0.528 0,0.168 0.104,0.312 0.184,0.408 0.664,0.791 1.383,1.511 1.991,2.391 0.144,0.208 0.279,0.455 0.279,0.743 0,0.328 -0.248,0.616 -0.575,0.616 -0.92,0 -0.48,-1.295 -1.248,-1.295 -0.384,0 -0.583,0.271 -0.583,0.583 0,1.008 0.895,1.815 1.879,1.815 0.983,0 1.774,-0.648 1.774,-1.663 C 0.455,1.959 -0.784,0.855 -1.463,0 L 0,0 Z"/></g><g transform="translate(11.4165,17.0303)" id="g56"><path id="path58" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -8.333,0 c -0.277,0 -0.5,0.224 -0.5,0.5 0,0.276 0.223,0.5 0.5,0.5 L 0,1 C 0.276,1 0.5,0.776 0.5,0.5 0.5,0.224 0.276,0 0,0"/></g></g></g><g id="g60"><g clip-path="url(#clipPath64)" id="g62"><g transform="translate(36,0)" id="g68"><path id="path70" style="fill:#e1e8ed;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(17.6396,7.8994)" id="g72"><path id="path74" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.744,-1.268 2.848,-1.55 4.36,-1.55 1.512,0 2.616,0.283 4.36,1.55 l 0,3.811 L 0,3.811 0,0 Z"/></g><g transform="translate(17.6318,10.0273)" id="g76"><path id="path78" style="fill:#f9ca55;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(15.4443,20.0645)" id="g80"><path id="path82" style="fill:#ffdc5d;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(31.833,20.0645)" id="g84"><path id="path86" style="fill:#ffdc5d;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(13.4775,19.0405)" id="g88"><path id="path90" style="fill:#ffdc5d;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(26.5254,14.6543)" id="g92"><path id="path94" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.268,0.274 c -0.405,0.094 -1.173,0.072 -1.536,0.072 l -1.721,0 -1.967,0 c -0.363,0 -1.131,0.022 -1.536,-0.072 L -9.294,0 c -0.349,-0.101 -0.55,-0.393 -0.451,-0.74 0.082,-0.288 0.346,-0.441 0.631,-0.441 0.059,0 0.119,0.027 0.179,0.042 l 1.267,0.371 c -0.143,-0.191 -0.181,-0.446 -0.066,-0.675 0.115,-0.229 0.346,-0.361 0.586,-0.361 0.099,0 0.2,0.025 0.293,0.072 l 1.035,0.517 c 0.022,-0.215 0.138,-0.414 0.345,-0.517 0.094,-0.046 0.196,-0.07 0.293,-0.07 0.242,0 0.473,0.134 0.587,0.364 l 0.07,0.137 -0.053,-0.137 c 0.114,-0.23 0.223,-0.364 0.465,-0.364 0.097,0 0.198,0.024 0.292,0.07 0.207,0.103 0.323,0.302 0.346,0.517 l 1.034,-0.517 c 0.094,-0.047 0.195,-0.072 0.293,-0.072 0.241,0 0.471,0.132 0.586,0.361 0.115,0.229 0.077,0.484 -0.065,0.675 l 1.266,-0.371 c 0.059,-0.015 0.121,-0.042 0.18,-0.042 0.285,0 0.547,0.153 0.63,0.441 C 0.549,-0.393 0.348,-0.101 0,0"/></g><g transform="translate(22,32.5205)" id="g96"><path id="path98" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 5.648,0 9.178,-4.168 9.178,-7.641 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,-4.168 -6.354,0 0,0"/></g><g transform="translate(18,19)" id="g100"><path id="path102" style="fill:#662113;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(26,19)" id="g104"><path id="path106" style="fill:#662113;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.75,16.25)" id="g108"><path id="path110" style="fill:#c1694f;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(21.9395,5.1172)" id="g112"><path id="path114" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 3.381,-2.494 4.094,-2.777 4.25,-2.84 3.727,0.879 3.727,0.879 l -7.454,0 c 0,0 -0.524,-3.781 -0.235,-3.625 C -3.32,-2.404 0,0 0,0"/></g><g transform="translate(23.252,2.5586)" id="g116"><path id="path118" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.375,0.625 0.531,0.906 0.182,0.328 0.453,1.571 0.453,1.571 l -2.187,0.961 c 0,0.007 -0.16,-0.006 -0.16,-0.006 L -1.547,3.391 -1.719,3.328 C -1.937,3.258 -1.625,3.32 -1.625,3.313 L -3.6,2.477 c 0,0 0.287,-1.243 0.471,-1.571 C -2.973,0.625 -2.602,0 -2.602,0 c 0,0 -0.752,-0.562 -1.035,-2.564 l 2.325,0 0.019,0 2.324,0 C 0.75,-0.969 0,0 0,0"/></g><g transform="translate(17.2295,9.3711)" id="g120"><path id="path122" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.565,-0.566 4.71,-3.383 4.71,-3.383 0,0 -2.125,-1.242 -4.086,-3.535 -0.195,-0.23 -1.543,4.625 -1.584,5.709 C -0.972,-0.906 -0.271,0.271 0,0"/></g><g transform="translate(26.6699,9.3711)" id="g124"><path id="path126" style="fill:#f5f8fa;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.125,-1.242 4.084,-3.535 0.195,-0.23 1.541,4.625 1.582,5.709 C 0.969,-0.906 0.27,0.271 0,0"/></g><g transform="translate(21.9551,5.3086)" id="g128"><path id="path130" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.389,0.021 1.543,-0.771 1.422,-1.25 -0.461,-1.828 -0.85,-1.391 -1.391,-1.391 -0.611,0 -0.965,-0.472 -1.39,1.313 C -1.453,-0.941 -0.562,-0.031 0,0"/></g><g transform="translate(23.9863,-0.0039)" id="g132"><path id="path134" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.023,0 c 0,0 0.541,2.166 2.017,2.166 C -0.529,2.166 0,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#D99E82" d="M30 26c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h22c2.209 0 4 1.791 4 4v22z"/><path fill="#5C913B" d="M28 26c0 1.104-.896 2-2 2H4c-1.104 0-2-.896-2-2V4c0-1.105.896-2 2-2h22c1.104 0 2 .895 2 2v22z"/><path fill="#FFF" d="M7.515 8.898c-.08.096-.184.24-.184.408 0 .368.272.528.624.528h2.67c.304 0 .576-.16.576-.528s-.271-.528-.624-.528H9.114c.679-.855 1.919-1.958 1.919-3.07 0-1.015-.792-1.663-1.775-1.663s-1.879.807-1.879 1.815c0 .311.2.583.584.583.768 0 .328-1.295 1.247-1.295.328 0 .576.288.576.616 0 .288-.136.536-.28.744-.608.879-1.327 1.599-1.991 2.39zm-1.307 5.433H5.049v-1.16c0-.288-.184-.479-.48-.479-.295 0-.479.192-.479.479v1.16H2.931c-.296 0-.48.192-.48.479 0 .288.184.48.48.48H4.09v1.159c0 .288.184.479.479.479.296 0 .48-.191.48-.479V15.29h1.159c.296 0 .48-.192.48-.48 0-.287-.184-.479-.48-.479zm4.369 1.447H9.113c.68-.855 1.919-1.958 1.919-3.07 0-1.015-.792-1.663-1.775-1.663s-1.879.808-1.879 1.815c0 .311.2.583.583.583.768 0 .328-1.295 1.248-1.295.328 0 .576.288.576.616 0 .288-.136.536-.28.744-.608.879-1.327 1.599-1.991 2.391-.08.096-.184.24-.184.408 0 .368.272.528.624.528h2.67c.304 0 .576-.16.576-.528 0-.369-.271-.529-.623-.529zm.84 3.192H3.083c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h8.333c.276 0 .5.224.5.5.001.276-.223.5-.499.5z"/><path fill="#E1E8ED" d="M36 36v-2c0-3.314-2.686-6-6-6H14c-3.313 0-6 2.686-6 6v2h28z"/><path fill="#FFDC5D" d="M17.64 28.101c1.744 1.268 2.848 1.55 4.36 1.55 1.512 0 2.615-.283 4.359-1.55V24.29h-8.72v3.811z"/><path fill="#F9CA55" d="M17.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="#FFDC5D" d="M15.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="#FFDC5D" d="M13.477 16.959c0-5.589 3.816-10.121 8.523-10.121s8.522 4.532 8.522 10.121S26.707 27.08 22 27.08c-4.706 0-8.523-4.531-8.523-10.121"/><path fill="#FFAC33" d="M26.525 21.346l-1.268-.274c-.404-.094-1.173-.072-1.535-.072h-3.689c-.362 0-1.131-.022-1.536.071l-1.266.274c-.348.101-.55.393-.45.74.082.288.345.441.63.441.059 0 .12-.026.18-.042l1.267-.371c-.143.191-.181.446-.066.676.115.228.347.36.587.36.099 0 .199-.024.293-.071l1.034-.518c.022.215.139.414.346.518.094.046.195.069.293.069.241 0 .473-.134.587-.363l.068-.138-.053.138c.114.229.224.363.465.363.098 0 .198-.023.292-.069.207-.104.323-.303.347-.518l1.033.518c.095.047.195.071.293.071.241 0 .472-.132.587-.36.114-.229.076-.484-.066-.676l1.266.371c.059.016.121.042.181.042.285 0 .547-.152.63-.441.099-.347-.102-.639-.45-.739zM22 3.48c5.648 0 9.178 4.168 9.178 7.641s-.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.473C12.822 7.648 15.646 3.48 22 3.48"/><path fill="#662113" d="M18 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="#C1694F" d="M22.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="#99AAB5" d="M21.94 30.883s3.381 2.494 4.094 2.777c.156.062-.367-3.656-.367-3.656h-7.453s-.524 3.781-.235 3.625c.64-.342 3.961-2.746 3.961-2.746"/><path fill="#BE1931" d="M23.252 33.441s.375-.625.531-.906c.182-.328.453-1.57.453-1.57l-2.188-.961c0-.008-.16.006-.16.006l-.184.041-.172.062c-.219.07.094.008.094.016l-1.975.836s.287 1.242.471 1.57c.156.281.527.906.527.906s-.752.562-1.035 2.564h4.667c-.279-1.595-1.029-2.564-1.029-2.564"/><path fill="#F5F8FA" d="M17.229 26.629c.565.566 4.71 3.383 4.71 3.383s-2.125 1.242-4.086 3.535c-.195.23-1.542-4.625-1.584-5.709-.011-.303.69-1.481.96-1.209m9.441 0c-.566.566-4.709 3.383-4.709 3.383s2.125 1.242 4.084 3.535c.195.23 1.541-4.625 1.582-5.709.012-.303-.687-1.481-.957-1.209"/><path fill="#DD2E44" d="M21.955 30.691c.389-.021 1.543.771 1.422 1.25-.461 1.828-.85 1.391-1.391 1.391-.611 0-.965.473-1.391-1.312-.093-.387.798-1.297 1.36-1.329m2.031 5.313h-4.023s.541-2.166 2.018-2.166c1.476 0 2.005 2.166 2.005 2.166"/></svg> \ No newline at end of file |