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/1f38f.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/1f38f.svg')
-rw-r--r-- | public/emoji/1f38f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f38f.svg b/public/emoji/1f38f.svg index 51c1fbde8..5457d1e8d 100644 --- a/public/emoji/1f38f.svg +++ b/public/emoji/1f38f.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="clipPath18" clipPathUnits="userSpaceOnUse"><path id="path20" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath50" clipPathUnits="userSpaceOnUse"><path id="path52" d="M 10,15 C 7.791,15 7,13.209 7,11 L 7,11 7,7 C 7,4.791 7.791,3 10,3 l 0,0 25,0 c 2.209,0 -4,3.791 -4,6 l 0,0 c 0,2.209 6.209,6 4,6 l 0,0 -25,0 z"/></clipPath><clipPath id="clipPath62" clipPathUnits="userSpaceOnUse"><path id="path64" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath90" clipPathUnits="userSpaceOnUse"><path id="path92" d="M 10,31 C 7.791,31 7,29.209 7,27 l 0,0 0,-4 c 0,-2.209 0.791,-4 3,-4 l 0,0 25,0 c 2.209,0 -4,3.791 -4,6 l 0,0 c 0,2.209 6.209,6 4,6 l 0,0 -25,0 z"/></clipPath></defs><g transform="matrix(1.25,0,0,-1.25,0,45)" id="g10"><path id="path12" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 3,0 2.001,0 0,33 L 3,33 3,0 Z"/><g id="g14"><g clip-path="url(#clipPath18)" id="g16"><g transform="translate(7,33)" id="g22"><path id="path24" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.343,-3 -3,-3 -1.657,0 -3,1.343 -3,3 0,1.657 1.343,3 3,3 1.657,0 3,-1.343 3,-3"/></g><g transform="translate(9,8)" id="g26"><path id="path28" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L 0,2 C 0.552,2 1,1.553 1,1 1,0.447 0.552,0 0,0"/></g><g transform="translate(27,14)" id="g30"><path id="path32" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.656 -2.463,-3 -5.5,-3 -3.038,0 -5.5,1.344 -5.5,3 0,1.656 0.462,4 3.5,4 C -4.463,4 0,1.656 0,0"/></g><g transform="translate(31,9)" id="g34"><path id="path36" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 6.209,-6 4,-6 l -25,0 c -2.209,0 -3,1.791 -3,4 l 0,4 c 0,2.209 0.791,4 3,4 L 4,6 C 6.209,6 0,2.209 0,0"/></g><g transform="translate(15,11)" id="g38"><path id="path40" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.656 -1.343,-3 -3,-3 -1.657,0 -3,1.344 -3,3 0,1.656 1.343,3 3,3 1.657,0 3,-1.344 3,-3"/></g><g transform="translate(13,11.5)" id="g42"><path id="path44" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.828 -0.671,-1.5 -1.5,-1.5 -2.329,-1.5 -3,-0.828 -3,0 -3,0.828 -2.329,1.5 -1.5,1.5 -0.671,1.5 0,0.828 0,0"/></g></g></g><g id="g46"><g clip-path="url(#clipPath50)" id="g48"><g transform="translate(15,16)" id="g54"><path id="path56" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2,-2 7,-7 0,-14 4,-1 10,-1.458 16,-1 6,0.458 6,4.75 6,7.209 C 22,-5.334 28,0 21,1 14,2 0,0 0,0"/></g></g></g><g id="g58"><g clip-path="url(#clipPath62)" id="g60"><g transform="translate(9,24)" id="g66"><path id="path68" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5,0 c -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 L 0,2 C 0.552,2 1,1.552 1,1 1,0.448 0.552,0 0,0"/></g><g transform="translate(27,30)" id="g70"><path id="path72" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -2.463,-3 -5.5,-3 -3.038,0 -5.5,1.343 -5.5,3 0,1.657 0.462,4 3.5,4 C -4.463,4 0,1.657 0,0"/></g><g transform="translate(31,25)" id="g74"><path id="path76" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 6.209,-6 4,-6 l -25,0 c -2.209,0 -3,1.791 -3,4 l 0,4 c 0,2.209 0.791,4 3,4 L 4,6 C 6.209,6 0,2.209 0,0"/></g><g transform="translate(15,27)" id="g78"><path id="path80" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.343,-3 -3,-3 -1.657,0 -3,1.343 -3,3 0,1.657 1.343,3 3,3 1.657,0 3,-1.343 3,-3"/></g><g transform="translate(13,27.5)" id="g82"><path id="path84" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.829 -0.671,-1.5 -1.5,-1.5 -2.329,-1.5 -3,-0.829 -3,0 -3,0.829 -2.329,1.5 -1.5,1.5 -0.671,1.5 0,0.829 0,0"/></g></g></g><g id="g86"><g clip-path="url(#clipPath90)" id="g88"><g transform="translate(15,32)" id="g94"><path id="path96" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2,-2 7,-7 0,-14 4,-1 10,-1.458 16,-1 6,0.458 6,4.751 6,7.208 C 22,-5.333 28,0 21,1 14,2 0,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M3 3h2v33H3z"/><circle fill="#F4900C" cx="4" cy="3" r="3"/><path fill="#66757F" d="M9 28H4c-.552 0-1-.447-1-1s.448-1 1-1h5c.552 0 1 .447 1 1s-.448 1-1 1z"/><path fill="#DD2E44" d="M31 27c0-2.209 6.209-6 4-6h-8.447c-1.203-1.464-4.595-3-7.053-3-2.459 0-3.23 1.536-3.435 3H10c-2.209 0-3 1.791-3 4v4c0 2.209.791 4 3 4h25c2.209 0-4-3.791-4-6z"/><circle fill="#FFF" cx="12" cy="25" r="3"/><circle cx="11.5" cy="24.5" r="1.5"/><path fill="#F4ABBA" d="M35 21H15.962c2.068 2.286 4.742 6.465-.037 12H35c2.209 0-4-3.791-4-6s6.209-6 4-6z"/><path fill="#66757F" d="M9 12H4c-.552 0-1-.448-1-1s.448-1 1-1h5c.552 0 1 .448 1 1s-.448 1-1 1z"/><path fill="#55ACEE" d="M31 11c0-2.209 6.209-6 4-6h-8.446c-1.203-1.464-4.595-3-7.054-3-2.459 0-3.23 1.536-3.435 3H10C7.791 5 7 6.791 7 9v4c0 2.209.791 4 3 4h25c2.209 0-4-3.791-4-6z"/><circle fill="#FFF" cx="12" cy="9" r="3"/><circle cx="11.5" cy="8.5" r="1.5"/><path fill="#BBDDF5" d="M35 5H15.962c2.068 2.286 4.742 6.465-.037 12H35c2.209 0-4-3.791-4-6s6.209-6 4-6z"/></svg> \ No newline at end of file |