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/1f46f-200d-2640-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/1f46f-200d-2640-fe0f.svg')
-rw-r--r-- | public/emoji/1f46f-200d-2640-fe0f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f46f-200d-2640-fe0f.svg b/public/emoji/1f46f-200d-2640-fe0f.svg index e3d470d6f..4d00a954a 100644 --- a/public/emoji/1f46f-200d-2640-fe0f.svg +++ b/public/emoji/1f46f-200d-2640-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="clipPath20" clipPathUnits="userSpaceOnUse"><path id="path22" 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 transform="translate(7.9999,1)" id="g12"><path id="path14" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 1,9.712 3,0 L 0,0 Z"/></g><g id="g16"><g clip-path="url(#clipPath20)" id="g18"><g transform="translate(13.8754,2.208)" id="g24"><path id="path26" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.834,1.333 c 0,0 3.167,3.012 2.532,3.994 -0.637,0.982 -3.782,1.688 -3.782,1.688 l 1.918,2.306 c 0,0 3.957,-1.904 4.77,-3.333 C 4.43,4.537 0,0 0,0"/></g><g transform="translate(3.9999,0)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,1 C 0,1 0,2 2,2 4,2 4,1 4,1 L 4,0 0,0 Z"/></g><g transform="translate(14.5531,0.5166)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.421,0.908 c 0,0 0.419,0.907 -1.396,1.747 C -2.788,3.496 -3.208,2.589 -3.208,2.589 L -3.628,1.682 0,0 Z"/></g><g transform="translate(4.9999,9.7119)" id="g36"><path id="path38" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.256,0 -0.512,0.098 -0.707,0.293 l -3,3 c -0.36,0.36 -0.392,0.934 -0.074,1.332 l 4,3.288 C 0.564,8.345 1.194,8.414 1.625,8.069 2.056,7.724 2.126,7.095 1.781,6.663 L -1.66,4.074 0.707,1.707 C 1.098,1.316 1.098,0.684 0.707,0.293 0.512,0.098 0.256,0 0,0"/></g><g transform="translate(14.9999,9.7119)" id="g40"><path id="path42" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.256,0 -0.512,0.098 -0.707,0.293 -0.391,0.391 -0.391,1.023 0,1.414 L 1.66,4.074 -1.781,6.663 c -0.345,0.432 -0.275,1.061 0.157,1.406 0.43,0.345 1.06,0.276 1.405,-0.156 l 4,-3.288 C 4.1,4.227 4.067,3.653 3.707,3.293 l -3,-3 C 0.512,0.098 0.256,0 0,0"/></g><g transform="translate(15.9999,17)" id="g44"><path id="path46" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.105 -0.896,2 -2,2 l -2,0 -4,0 -2,0 c -1.104,0 -2,-0.895 -2,-2 l 0,-1 2,0 0,-1.288 0,-1 0,-3 3,-2 2,0 3,2 0,3 0,1 0,1.288 2,0 0,1 z"/></g><g transform="translate(11.9999,19)" id="g48"><path id="path50" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,3 -4,0 0,-3 -1,0 0,-1 c 0,0 0,-3 3,-3 3,0 3,3 3,3 L 1,0 0,0 Z"/></g><g transform="translate(11.9999,22)" id="g52"><path id="path54" style="fill:#f9ca55;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4,-0.019 -4,-4 c 0,0 2,-1 4,0 l 0,4 z"/></g><g transform="translate(16.9999,26.999)" id="g56"><path id="path58" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,3.314 -2.687,6.001 -6,6.001 -1.264,0 -2.435,-0.393 -3.402,-1.061 -0.197,0.03 -0.393,0.061 -0.598,0.061 -2.209,0 -4,-1.791 -4,-4 l 0,-6 2.422,0 C -11.846,-4.386 -12,-3.712 -12,-3 l 0,10e-4 0,2.106 c 2.989,0.609 3,3.894 3,3.894 0,0 0.019,-3.644 7,-3.968 L -2,-2.999 -2,-3 c 0,-0.712 -0.154,-1.386 -0.422,-1.999 L 0,-4.999 0,0 Z"/></g><g transform="translate(14.9999,24)" id="g60"><path id="path62" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,2.032 C -6.981,2.356 -7,6 -7,6 -7,6 -7.011,2.715 -10,2.106 L -10,0 l 0,0 c 0,-0.713 0.154,-1.387 0.422,-2 0.772,-1.765 2.528,-3 4.578,-3 2.049,0 3.806,1.235 4.578,3 C -0.154,-1.387 0,-0.713 0,0 Z"/></g><g transform="translate(11.9999,21)" id="g64"><path id="path66" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 -2,0 c 0,0 0,-1 2,-1 2,0 2,1 2,1"/></g><g transform="translate(7.9999,24.5)" id="g68"><path id="path70" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 -1,0.276 -0.776,0.5 -0.5,0.5 -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(12.9999,24.5)" id="g72"><path id="path74" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 -1,0.276 -0.776,0.5 -0.5,0.5 -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(8.9999,23)" id="g76"><path id="path78" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1,0 2,0 C 2,0 1.999,-1 1,-1 0,-1 0,0 0,0"/></g><g transform="translate(4.6874,34.875)" id="g80"><path id="path82" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.625,0.219 3.75,-2.875 3,-4.25 1.031,-4.25 -0.937,-2.438 0,0"/></g><g transform="translate(14.6747,34.8125)" id="g84"><path id="path86" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.625,0.219 -3.75,-2.875 -3,-4.25 1.969,0 3.937,1.812 3,4.25"/></g><g transform="translate(7.3124,31.75)" id="g88"><path id="path90" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.812,1.437 4.344,1.062 5.156,-0.156 5.187,-0.469 4.786,-1.334 4.469,-1.187 3.656,-0.812 2.281,-0.25 0.406,-1.125 0.312,-1.062 -0.035,-0.027 0,0"/></g><g transform="translate(23.9999,1)" id="g92"><path id="path94" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 1,9.712 3,0 L 0,0 Z"/></g><g transform="translate(29.8749,2.208)" id="g96"><path id="path98" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.833,1.333 c 0,0 3.167,3.012 2.531,3.994 -0.636,0.982 -3.782,1.688 -3.782,1.688 l 1.918,2.306 c 0,0 3.958,-1.904 4.77,-3.333 C 4.43,4.537 0,0 0,0"/></g><g transform="translate(30.5526,0.5166)" id="g100"><path id="path102" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.422,0.908 c 0,0 0.418,0.907 -1.397,1.747 C -2.787,3.496 -3.207,2.589 -3.207,2.589 L -3.627,1.682 0,0 Z"/></g><g transform="translate(19.9999,0)" id="g104"><path id="path106" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,1 C 0,1 0,2 2,2 4,2 4,1 4,1 L 4,0 0,0 Z"/></g><g transform="translate(20.9999,9.7119)" id="g108"><path id="path110" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.256,0 -0.512,0.098 -0.707,0.293 l -3,3 c -0.36,0.36 -0.392,0.934 -0.074,1.332 l 4,3.288 C 0.564,8.345 1.194,8.414 1.625,8.069 2.057,7.724 2.126,7.095 1.781,6.663 L -1.66,4.074 0.707,1.707 C 1.098,1.316 1.098,0.684 0.707,0.293 0.512,0.098 0.256,0 0,0"/></g><g transform="translate(30.9999,9.7119)" id="g112"><path id="path114" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.256,0 -0.512,0.098 -0.707,0.293 -0.391,0.391 -0.391,1.023 0,1.414 L 1.66,4.074 -1.781,6.663 c -0.345,0.432 -0.276,1.061 0.156,1.406 0.431,0.345 1.061,0.276 1.406,-0.156 l 4,-3.288 C 4.1,4.227 4.067,3.653 3.707,3.293 l -3,-3 C 0.512,0.098 0.256,0 0,0"/></g><g transform="translate(31.9999,17)" id="g116"><path id="path118" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.105 -0.896,2 -2,2 l -2,0 -4,0 -2,0 c -1.105,0 -2,-0.895 -2,-2 l 0,-1 2,0 0,-1.288 0,-1 0,-3 3,-2 2,0 3,2 0,3 0,1 0,1.288 2,0 0,1 z"/></g><g transform="translate(27.9999,19)" id="g120"><path id="path122" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,3 -4,0 0,-3 -1,0 0,-1 c 0,0 0,-3 3,-3 3,0 3,3 3,3 L 1,0 0,0 Z"/></g><g transform="translate(27.9999,22)" id="g124"><path id="path126" style="fill:#f9ca55;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4,-0.019 -4,-4 c 0,0 2,-1 4,0 l 0,4 z"/></g><g transform="translate(32.9999,26.999)" id="g128"><path id="path130" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,3.314 -2.687,6.001 -6,6.001 -1.264,0 -2.435,-0.393 -3.402,-1.061 -0.197,0.03 -0.393,0.061 -0.598,0.061 -2.209,0 -4,-1.791 -4,-4 l 0,-6 2.422,0 C -11.846,-4.386 -12,-3.712 -12,-3 l 0,10e-4 0,2.106 c 2.989,0.609 3,3.894 3,3.894 0,0 0.019,-3.644 7,-3.968 L -2,-2.999 -2,-3 c 0,-0.712 -0.154,-1.386 -0.422,-1.999 L 0,-4.999 0,0 Z"/></g><g transform="translate(30.9999,24)" id="g132"><path id="path134" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,2.032 C -6.981,2.356 -7,6 -7,6 -7,6 -7.011,2.715 -10,2.106 L -10,0 l 0,0 c 0,-0.713 0.154,-1.387 0.422,-2 0.772,-1.765 2.528,-3 4.578,-3 2.05,0 3.806,1.235 4.578,3 C -0.154,-1.387 0,-0.713 0,0 Z"/></g><g transform="translate(27.9999,21)" id="g136"><path id="path138" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 -2,0 c 0,0 0,-1 2,-1 2,0 2,1 2,1"/></g><g transform="translate(23.9999,24.5)" id="g140"><path id="path142" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 -1,0.276 -0.776,0.5 -0.5,0.5 -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(28.9999,24.5)" id="g144"><path id="path146" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 -1,0.276 -0.776,0.5 -0.5,0.5 -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(24.9999,23)" id="g148"><path id="path150" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1,0 2,0 C 2,0 2,-1 1,-1 0,-1 0,0 0,0"/></g><g transform="translate(20.7812,34.875)" id="g152"><path id="path154" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.625,0.219 3.75,-2.875 3,-4.25 1.031,-4.25 -0.937,-2.438 0,0"/></g><g transform="translate(30.7685,34.8125)" id="g156"><path id="path158" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.625,0.219 -3.75,-2.875 -3,-4.25 1.969,0 3.937,1.812 3,4.25"/></g><g transform="translate(23.4062,31.75)" id="g160"><path id="path162" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.812,1.437 4.344,1.062 5.156,-0.156 5.187,-0.469 4.786,-1.334 4.469,-1.187 3.656,-0.812 2.281,-0.25 0.406,-1.125 0.312,-1.062 -0.035,-0.027 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFDC5D" d="M8 35H5l1-9.712h3zm5.875-1.208l-1.834-1.333s3.167-3.012 2.531-3.994c-.636-.981-3.782-1.688-3.782-1.688l1.918-2.307s3.958 1.904 4.77 3.333c.827 1.452-3.603 5.989-3.603 5.989z"/><path fill="#292F33" d="M4 36v-1s0-1 2-1 2 1 2 1v1H4zm10.553-.517l.421-.908s.419-.907-1.396-1.747c-1.813-.841-2.233.066-2.233.066l-.42.907 3.628 1.682z"/><path fill="#FFDC5D" d="M5 26.288c-.256 0-.512-.098-.707-.293l-3-3c-.36-.36-.392-.934-.074-1.332l4-3.288c.345-.432.975-.501 1.405-.156.432.345.501.974.156 1.406l-3.44 2.589 2.367 2.367c.391.391.391 1.023 0 1.414-.195.195-.451.293-.707.293zm10 0c-.256 0-.512-.098-.707-.293-.391-.391-.391-1.023 0-1.414l2.367-2.367-3.441-2.589c-.345-.432-.275-1.06.156-1.406.43-.345 1.06-.276 1.405.156l4.001 3.288c.318.398.286.972-.074 1.332l-3 3c-.195.195-.451.293-.707.293z"/><path fill="#292F33" d="M16 19c0-1.104-.896-2-2-2H6c-1.104 0-2 .896-2 2v1h2v5.288l3 2h2l3-2V20h2v-1z"/><path fill="#FFDC5D" d="M12 17v-3H8v3H7v1s0 3 3 3 3-3 3-3v-1h-1z"/><path fill="#F9CA55" d="M12 14l-4 .019V18s2 1 4 0v-4z"/><path fill="#FFAC33" d="M17 9.001C17 5.687 14.313 3 10.999 3c-1.263 0-2.434.393-3.401 1.06C7.401 4.031 7.204 4 7 4 4.791 4 3 5.791 3 8v6h2.422C5.153 13.387 5 12.713 5 12V9.894C7.989 9.285 8 6 8 6s.019 3.644 7 3.968V12c0 .712-.154 1.387-.422 2H17V9.001z"/><path fill="#FFDC5D" d="M15 12V9.968C8.018 9.644 8 6 8 6s-.011 3.285-3 3.894V12c0 .712.154 1.387.422 2 .772 1.765 2.528 3 4.578 3 2.05 0 3.807-1.235 4.579-3 .267-.613.421-1.287.421-2z"/><path fill="#DF1F32" d="M12 15H8s0 1 2 1 2-1 2-1z"/><circle fill="#662113" cx="7.5" cy="11.5" r=".5"/><circle fill="#662113" cx="12.5" cy="11.5" r=".5"/><path fill="#C1694F" d="M9 13h2s0 1-1 1-1-1-1-1z"/><path fill="#292F33" d="M4.687 1.125c2.625-.219 3.75 2.875 3 4.25-1.968 0-3.937-1.813-3-4.25zm9.988.063c-2.625-.219-3.75 2.875-3 4.25 1.968 0 3.937-1.813 3-4.25z"/><path fill="#292F33" d="M7.312 4.25c1.812-1.438 4.344-1.062 5.156.156.031.312-.37 1.178-.688 1.031-.811-.375-2.186-.937-4.061-.062-.094-.063-.441-1.098-.407-1.125z"/><path fill="#FFDC5D" d="M24 35h-3l1-9.712h3zm5.875-1.208l-1.833-1.333s3.167-3.012 2.531-3.994c-.636-.981-3.782-1.688-3.782-1.688l1.918-2.307s3.958 1.904 4.77 3.333c.826 1.452-3.604 5.989-3.604 5.989z"/><path fill="#292F33" d="M30.553 35.483l.422-.908s.418-.907-1.396-1.747c-1.812-.841-2.232.066-2.232.066l-.42.907 3.626 1.682zM20 36v-1s0-1 2-1 2 1 2 1v1h-4z"/><path fill="#FFDC5D" d="M21 26.288c-.256 0-.512-.098-.707-.293l-3-3c-.36-.36-.392-.934-.074-1.332l4-3.288c.346-.432.976-.501 1.406-.156.432.345.501.974.156 1.406l-3.441 2.589 2.367 2.367c.391.391.391 1.023 0 1.414-.195.195-.451.293-.707.293zm10 0c-.256 0-.512-.098-.707-.293-.391-.391-.391-1.023 0-1.414l2.367-2.367-3.441-2.589c-.345-.432-.275-1.06.156-1.406.431-.345 1.06-.276 1.406.156l4 3.288c.318.398.286.972-.074 1.332l-3 3c-.195.195-.451.293-.707.293z"/><path fill="#292F33" d="M32 19c0-1.104-.896-2-2-2h-8c-1.104 0-2 .896-2 2v1h2v5.288l3 2h2l3-2V20h2v-1z"/><path fill="#FFDC5D" d="M28 17v-3h-4v3h-1v1s0 3 3 3 3-3 3-3v-1h-1z"/><path fill="#F9CA55" d="M28 14l-4 .019V18s2 1 4 0v-4z"/><path fill="#FFAC33" d="M33 9.001C33 5.687 30.313 3 27 3c-1.264 0-2.435.393-3.402 1.06C23.401 4.031 23.205 4 23 4c-2.209 0-4 1.791-4 4v6h2.422c-.269-.613-.422-1.287-.422-2V9.894C23.989 9.285 24 6 24 6s.019 3.644 7 3.968V12c0 .712-.154 1.387-.422 2H33V9.001z"/><path fill="#FFDC5D" d="M31 12V9.968C24.018 9.644 24 6 24 6s-.011 3.285-3 3.894V12c0 .712.154 1.387.422 2 .772 1.765 2.529 3 4.578 3s3.806-1.235 4.578-3c.268-.613.422-1.287.422-2z"/><path fill="#DF1F32" d="M28 15h-4s0 1 2 1 2-1 2-1z"/><circle fill="#662113" cx="23.5" cy="11.5" r=".5"/><circle fill="#662113" cx="28.5" cy="11.5" r=".5"/><path fill="#C1694F" d="M25 13h2s0 1-1 1-1-1-1-1z"/><path fill="#292F33" d="M20.781 1.125c2.625-.219 3.75 2.875 3 4.25-1.969 0-3.937-1.813-3-4.25zm9.987.063c-2.625-.219-3.75 2.875-3 4.25 1.969 0 3.938-1.813 3-4.25z"/><path fill="#292F33" d="M23.406 4.25c1.812-1.438 4.344-1.062 5.156.156.031.312-.37 1.178-.688 1.031-.812-.375-2.188-.938-4.062-.062-.093-.063-.441-1.098-.406-1.125z"/></svg> \ No newline at end of file |