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/1f6ae.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/1f6ae.svg')
-rw-r--r-- | public/emoji/1f6ae.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f6ae.svg b/public/emoji/1f6ae.svg index 1a5d6ae55..dadbe6efa 100644 --- a/public/emoji/1f6ae.svg +++ b/public/emoji/1f6ae.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(0,32)" id="g20"><path id="path22" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,4 4,4 4,4 l 28,0 c 0,0 4,0 4,-4 l 0,-28 c 0,0 0,-4 -4,-4 l -28,0 c 0,0 -4,0 -4,4 L 0,0 Z"/></g><g transform="translate(26,28.5)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.933 -1.344,-3.5 -3,-3.5 -1.656,0 -3,1.567 -3,3.5 0,1.933 1.344,3.5 3,3.5 1.656,0 3,-1.567 3,-3.5"/></g><g transform="translate(29,23)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0,2 -2,2 l -7,0 c -1,0 -2,-1 -2,-1 l -2,-2 -4,0 c 0,0 -1,0 -1,-1 0,-1 1,-1 1,-1 l 3,0 2,0 2,2 0,-17 c 0,0 0,-1 1,-1 l 1,0 c 0,0 1,0 1,1 l 0,8 c 0,0 0,1 1,1 1,0 1,-1 1,-1 l 0,-8 c 0,0 0,-1 1,-1 l 1,0 c 0,0 1,0 1,1 l 0,9 c 0,0 2,0 2,2 l 0,7 z"/></g><g transform="translate(6,14)" id="g32"><path id="path34" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -1,0 -1,1 0,1 1,1 1,1 0,0 2,0 2,-2 l 0,-8 6,0 0,8 c 0,2 2,2 2,2 0,0 1,0 1,-1 0,-1 -1,-1 -1,-1 l 0,-8 c 0,0 0,-2 -2,-2 l -6,0 c 0,0 -2,0 -2,2 l 0,8 z"/></g><g transform="translate(13,16)" id="g36"><path id="path38" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#3B88C3" d="M0 4c0-4 4-4 4-4h28s4 0 4 4v28s0 4-4 4H4s-4 0-4-4V4z"/><ellipse fill="#FFF" cx="23" cy="7.5" rx="3" ry="3.5"/><path fill="#FFF" d="M29 13s0-2-2-2h-7c-1 0-2 1-2 1l-2 2h-4s-1 0-1 1 1 1 1 1h5l2-2v17s0 1 1 1h1s1 0 1-1v-8s0-1 1-1 1 1 1 1v8s0 1 1 1h1s1 0 1-1v-9s2 0 2-2v-7z"/><path fill="#FFF" d="M6 22s-1 0-1-1 1-1 1-1 2 0 2 2v8h6v-8c0-2 2-2 2-2s1 0 1 1-1 1-1 1v8s0 2-2 2H8s-2 0-2-2v-8z"/><circle fill="#FFF" cx="11" cy="20" r="2"/></svg> \ No newline at end of file |