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/1f6ba.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/1f6ba.svg')
| -rw-r--r-- | public/emoji/1f6ba.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f6ba.svg b/public/emoji/1f6ba.svg index 354a204c4..d73ed94bb 100644 --- a/public/emoji/1f6ba.svg +++ b/public/emoji/1f6ba.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:#ea596e;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(26.7949,20.2725)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -7.041,4.4 c 0.752,0.636 1.246,1.662 1.246,2.828 0,1.933 -1.344,3.5 -3,3.5 -1.657,0 -3,-1.567 -3,-3.5 0,-1.166 0.493,-2.192 1.245,-2.828 L -17.59,0 c -0.703,-0.439 -0.916,-1.364 -0.477,-2.067 0.439,-0.703 1.364,-0.915 2.066,-0.477 l 4.355,2.722 -4.149,-9.451 3,0 0,-6.5 c 0,-0.828 0.671,-1.5 1.5,-1.5 0.829,0 1.5,0.672 1.5,1.5 l 0,6.5 2,0 0,-6.5 c 0,-0.828 0.672,-1.5 1.5,-1.5 0.828,0 1.5,0.672 1.5,1.5 l 0,6.5 3,0 -4.15,9.451 4.355,-2.722 c 0.247,-0.155 0.522,-0.228 0.794,-0.228 0.5,0 0.988,0.25 1.274,0.705 C 0.916,-1.364 0.702,-0.439 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#EA596E" 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"/><path fill="#FFF" d="M26.795 15.727l-7.041-4.4C20.506 10.691 21 9.666 21 8.5 21 6.566 19.656 5 18 5c-1.657 0-3 1.567-3 3.5 0 1.166.494 2.192 1.246 2.828l-7.041 4.4c-.703.439-.916 1.364-.477 2.067.439.703 1.364.916 2.067.477l4.355-2.722L11 25h3v6.5c0 .828.671 1.5 1.5 1.5s1.5-.672 1.5-1.5V25h2v6.5c0 .828.672 1.5 1.5 1.5s1.5-.672 1.5-1.5V25h3l-4.15-9.45 4.355 2.722c.247.155.522.228.794.228.5 0 .988-.25 1.273-.705.439-.703.225-1.628-.477-2.068z"/></svg> \ No newline at end of file |
