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/2747.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/2747.svg')
-rw-r--r-- | public/emoji/2747.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/2747.svg b/public/emoji/2747.svg index 812425abc..61e199722 100644 --- a/public/emoji/2747.svg +++ b/public/emoji/2747.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></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,4)" id="g20"><path id="path22" style="fill:#77b255;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,28 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(15,18)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.657 1.343,3 3,3 4.656,3 6,1.657 6,0 6,-1.656 4.656,-3 3,-3 1.343,-3 0,-1.656 0,0"/></g><g transform="translate(20,32)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.104 -0.895,2 -2,2 -3.104,2 -4,1.104 -4,0 l 0,-8 c 0,-1.104 0.896,-2 2,-2 1.105,0 2,0.896 2,2 l 0,8 z"/></g><g transform="translate(20,12)" id="g32"><path id="path34" style="fill:#ffffff;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 l 0,-8 c 0,-1.105 0.896,-2 2,-2 1.105,0 2,0.895 2,2 l 0,8 z"/></g><g transform="translate(4,20)" id="g36"><path id="path38" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.104,0 -2,-0.895 -2,-2 0,-1.104 0.896,-2 2,-2 l 8,0 c 1.105,0 2,0.896 2,2 0,1.105 -0.895,2 -2,2 L 0,0 Z"/></g><g transform="translate(24,20)" id="g40"><path id="path42" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.104,0 -2,-0.895 -2,-2 0,-1.104 0.896,-2 2,-2 l 8,0 c 1.105,0 2,0.896 2,2 0,1.105 -0.895,2 -2,2 L 0,0 Z"/></g><g transform="translate(15.1714,22.2427)" id="g44"><path id="path46" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.391,-0.391 0.391,-1.024 0,-1.414 -0.39,-0.391 -1.023,-0.391 -1.414,0 l -7.485,7.485 c -0.391,0.39 -0.391,1.024 0,1.414 0.39,0.391 1.023,0.391 1.414,0 L 0,0 Z"/></g><g transform="translate(29.7275,7.6865)" id="g48"><path id="path50" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.392,-0.391 0.391,-1.024 0,-1.414 -0.39,-0.391 -1.023,-0.392 -1.414,0 l -7.485,7.485 c -0.391,0.391 -0.391,1.024 0,1.414 0.39,0.391 1.023,0.391 1.414,0 L 0,0 Z"/></g><g transform="translate(13.7573,15.1719)" id="g52"><path id="path54" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.391,0.391 1.024,0.391 1.414,0 0.391,-0.391 0.391,-1.023 0,-1.414 L -6.071,-8.9 c -0.39,-0.391 -1.024,-0.391 -1.414,0 -0.391,0.39 -0.391,1.024 0,1.415 L 0,0 Z"/></g><g transform="translate(28.3135,29.7275)" id="g56"><path id="path58" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.391,0.392 1.024,0.391 1.414,0 0.391,-0.39 0.392,-1.023 0,-1.414 l -7.485,-7.485 c -0.391,-0.391 -1.024,-0.391 -1.414,0 -0.391,0.39 -0.391,1.023 0,1.414 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#77B255" d="M36 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v28z"/><circle fill="#FFF" cx="18" cy="18" r="3"/><path fill="#FFF" d="M20 4c0-1.104-.896-2-2-2s-2 .896-2 2v8c0 1.104.896 2 2 2s2-.896 2-2V4zm0 20c0-1.104-.896-2-2-2s-2 .896-2 2v8c0 1.104.896 2 2 2s2-.896 2-2v-8zM4 16c-1.104 0-2 .896-2 2s.896 2 2 2h8c1.104 0 2-.896 2-2s-.896-2-2-2H4zm20 0c-1.104 0-2 .896-2 2s.896 2 2 2h8c1.104 0 2-.896 2-2s-.896-2-2-2h-8zm-8.829-2.243c.391.391.391 1.024 0 1.414-.39.391-1.024.391-1.414 0L6.272 7.687c-.391-.391-.391-1.024 0-1.415s1.024-.391 1.415 0l7.484 7.485zm14.557 14.556c.392.391.391 1.024 0 1.414-.39.391-1.023.392-1.414 0l-7.485-7.485c-.391-.391-.391-1.023 0-1.414s1.024-.391 1.414 0l7.485 7.485zm-15.971-7.485c.391-.391 1.024-.391 1.414 0 .391.391.391 1.024 0 1.414l-7.485 7.486c-.391.391-1.024.391-1.415 0s-.391-1.024 0-1.415l7.486-7.485zM28.313 6.272c.391-.392 1.024-.391 1.414 0 .391.39.392 1.023 0 1.414l-7.485 7.485c-.391.391-1.023.391-1.414 0s-.391-1.023 0-1.414l7.485-7.485z"/></svg> \ No newline at end of file |