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/1f682.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/1f682.svg')
-rw-r--r-- | public/emoji/1f682.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f682.svg b/public/emoji/1f682.svg index 2ea090c6f..c93874db2 100644 --- a/public/emoji/1f682.svg +++ b/public/emoji/1f682.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"><path id="path12" style="fill:#939598;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 36,0 36,2 0,2 0,0 Z"/><path id="path14" style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 35,4 6,4 6,9 35,9 35,4 Z"/><g id="g16"><g clip-path="url(#clipPath20)" id="g18"><g transform="translate(3.999,4)" id="g24"><path id="path26" style="fill:#58595b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.656 1.343,3 3,3 4.657,3 6,1.656 6,0 6,-1.656 4.657,-3 3,-3 1.343,-3 0,-1.656 0,0"/></g><g transform="translate(9.999,4)" id="g28"><path id="path30" style="fill:#58595b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.657 1.343,3 3,3 4.657,3 6,1.657 6,0 6,-1.657 4.657,-3 3,-3 1.343,-3 0,-1.657 0,0"/></g><g transform="translate(5.499,4)" id="g32"><path id="path34" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.829 0.672,1.5 1.5,1.5 2.328,1.5 3,0.829 3,0 3,-0.829 2.328,-1.5 1.5,-1.5 0.672,-1.5 0,-0.829 0,0"/></g><g transform="translate(11.499,4)" id="g36"><path id="path38" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.83 0.671,1.5 1.5,1.5 2.329,1.5 3,0.83 3,0 3,-0.83 2.329,-1.5 1.5,-1.5 0.671,-1.5 0,-0.83 0,0"/></g><g transform="translate(5,3)" id="g40"><path id="path42" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4,0 c -1,0 -1.5,0.5 0,2 L 0,6 C 1,7 2,8.001 2,6 L 2,2 C 2,0 1.999,0 0,0"/></g><g transform="translate(7.9995,16)" id="g44"><path id="path46" style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.314 -1.343,-6 -3,-6 -1.657,0 -3,2.686 -3,6 0,3.314 1.343,6.001 3,6.001 1.657,0 3,-2.687 3,-6.001"/></g><g transform="translate(11,21)" id="g48"><path id="path50" style="fill:#6d6e71;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4,0 -6,8 2,8 0,0 Z"/></g><g transform="translate(26,11)" id="g52"><path id="path54" style="fill:#414042;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -18,0 c -1.104,0 -2,0.896 -2,2 l 0,10 c 0,1.105 0.896,2 2,2 l 18,0 c 1.105,0 2,-0.895 2,-2 L 0,0 Z"/></g><g transform="translate(13,10)" id="g56"><path id="path58" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.448,-1 -1,-1 -0.552,0 -1,0.447 -1,1 l 0,13 c 0,0.552 0.448,1 1,1 0.552,0 1,-0.448 1,-1 L 0,0 Z"/></g><g transform="translate(19,10)" id="g60"><path id="path62" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 -0.553,0 -1,0.447 -1,1 l 0,13 c 0,0.552 0.447,1 1,1 0.553,0 1,-0.448 1,-1 L 0,0 Z"/></g><g transform="translate(36,10)" id="g64"><path id="path66" style="fill:#808285;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -28,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L -1,1 C -0.447,1 0,0.553 0,0"/></g><g transform="translate(25.999,5)" id="g68"><path id="path70" style="fill:#58595b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,2.209 1.791,4 4,4 6.209,4 8,2.209 8,0 8,-2.209 6.209,-4 4,-4 1.791,-4 0,-2.209 0,0"/></g><g transform="translate(17.999,5)" id="g72"><path id="path74" style="fill:#58595b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,2.209 1.791,4 4,4 6.209,4 8,2.209 8,0 8,-2.209 6.209,-4 4,-4 1.791,-4 0,-2.209 0,0"/></g><g transform="translate(27.999,5)" id="g76"><path id="path78" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.105 0.895,2 2,2 3.104,2 4,1.105 4,0 4,-1.105 3.104,-2 2,-2 0.895,-2 0,-1.105 0,0"/></g><g transform="translate(19.999,5)" id="g80"><path id="path82" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.105 0.895,2 2,2 3.104,2 4,1.105 4,0 4,-1.105 3.104,-2 2,-2 0.895,-2 0,-1.105 0,0"/></g><g transform="translate(12,33)" id="g84"><path id="path86" style="fill:#414042;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -6,0 c -0.552,0 -1,-0.448 -1,-1 l 0,-3 8,0 0,3 C 1,-0.448 0.552,0 0,0"/></g><path id="path88" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 35,29 -12,0 0,-18 12,0 0,18 z"/><g transform="translate(36,30)" id="g90"><path id="path92" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 l -12,0 c -0.553,0 -1,0.448 -1,1 0,0.552 0.447,1 1,1 L -1,1 C -0.447,1 0,0.552 0,0"/></g><path id="path94" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 33,13 -8,0 0,5 8,0 0,-5 z"/><g transform="translate(30,4)" id="g96"><path id="path98" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -8,0 C -8.127,0 -8.253,0.024 -8.371,0.071 L -13.193,2 -20,2 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 l 6.999,0 c 0.128,0 0.254,-0.024 0.372,-0.071 L -7.808,2 0,2 C 0.553,2 1,1.553 1,1 1,0.447 0.553,0 0,0"/></g><g transform="translate(33,26)" id="g100"><path id="path102" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.552 -0.447,1 -1,1 L -7,1 C -7.553,1 -8,0.552 -8,0 l 0,-5 c 0,-0.552 0.447,-1 1,-1 l 6,0 c 0.553,0 1,0.448 1,1 l 0,5 z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#939598" d="M0 34h36v2H0z"/><path fill="#231F20" d="M6 27h29v5H6z"/><circle fill="#58595B" cx="6.999" cy="32" r="3"/><circle fill="#58595B" cx="12.999" cy="32" r="3"/><circle fill="#A0041E" cx="6.999" cy="32" r="1.5"/><circle fill="#A0041E" cx="12.999" cy="32" r="1.5"/><path fill="#DD2E44" d="M5 33H1c-1 0-1.5-.5 0-2l4-4c1-1 2-2.001 2 0v4c0 2-.001 2-2 2z"/><path fill="#231F20" d="M8 20c0 3.313-1.343 6-3 6s-3-2.687-3-6c0-3.314 1.343-6 3-6s3 2.686 3 6z"/><path fill="#6D6E71" d="M11 15H7L5 7h8z"/><path fill="#414042" d="M26 25c0 1.104-.896 2-2 2H6c-1.104 0-2-.896-2-2V15c0-1.104.896-2 2-2h18c1.104 0 2 .896 2 2v10z"/><path fill="#C1694F" d="M13 26c0 .553-.448 1-1 1s-1-.447-1-1V13c0-.552.448-1 1-1s1 .448 1 1v13zm6 0c0 .553-.447 1-1 1-.553 0-1-.447-1-1V13c0-.552.447-1 1-1 .553 0 1 .448 1 1v13z"/><path fill="#808285" d="M36 26c0 .553-.447 1-1 1H7c-.552 0-1-.447-1-1 0-.553.448-1 1-1h28c.553 0 1 .447 1 1z"/><circle fill="#58595B" cx="29.999" cy="31" r="4"/><circle fill="#58595B" cx="21.999" cy="31" r="4"/><circle fill="#A0041E" cx="29.999" cy="31" r="2"/><circle fill="#A0041E" cx="21.999" cy="31" r="2"/><path fill="#414042" d="M12 3H6c-.552 0-1 .448-1 1v3h8V4c0-.552-.448-1-1-1z"/><path fill="#BE1931" d="M23 7h12v18H23z"/><path fill="#A0041E" d="M36 6c0 .552-.447 1-1 1H23c-.553 0-1-.448-1-1s.447-1 1-1h12c.553 0 1 .448 1 1z"/><path fill="#EA596E" d="M25 18h8v5h-8z"/><path fill="#F4900C" d="M30 32h-8c-.127 0-.253-.024-.371-.071L16.807 30H10c-.552 0-1-.447-1-1s.448-1 1-1h7c.128 0 .253.024.372.071L22.192 30H30c.553 0 1 .447 1 1s-.447 1-1 1z"/><path fill="#55ACEE" d="M33 10c0-.552-.447-1-1-1h-6c-.553 0-1 .448-1 1v5c0 .552.447 1 1 1h6c.553 0 1-.448 1-1v-5z"/></svg> \ No newline at end of file |