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/1f48d.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/1f48d.svg')
-rw-r--r-- | public/emoji/1f48d.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f48d.svg b/public/emoji/1f48d.svg index 8bbab8ac6..083416596 100644 --- a/public/emoji/1f48d.svg +++ b/public/emoji/1f48d.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(18,4)" id="g20"><path id="path22" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4.419,0 -8,3.582 -8,8 0,4.418 3.581,8 8,8 C 4.418,16 8,12.418 8,8 8,3.582 4.418,0 0,0 M 0,20 C -6.627,20 -12,14.627 -12,8 -12,1.373 -6.627,-4 0,-4 6.627,-4 12,1.373 12,8 12,14.627 6.627,20 0,20"/></g><g transform="translate(29,31)" id="g24"><path id="path26" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4,5 -7,0 -7,0 -4,-5 11,-9 11,9 z"/></g><g transform="translate(29,31)" id="g28"><path id="path30" style="fill:#8ccaf7;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4,5 -7,0 -7,0 -4,-5 11,0 11,0 z"/></g><g transform="translate(29,31)" id="g32"><path id="path34" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4,5 -6,0 -1,0 0,-5 1,0 10,0 z"/></g><g transform="translate(18,31)" id="g36"><path id="path38" style="fill:#8ccaf7;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 11,0 0,-9 0,0 Z"/></g><g transform="translate(25,23)" id="g40"><path id="path42" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.343,-3 -3,-3 l -8,0 c -1.657,0 -3,1.343 -3,3 0,1.657 1.343,3 3,3 l 8,0 C -1.343,3 0,1.657 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#9AAAB4" d="M18 12c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm0 20c-4.418 0-8-3.582-8-8s3.582-8 8-8 8 3.582 8 8-3.582 8-8 8z"/><path fill="#5DADEC" d="M29 5l-4-5H11L7 5l11 9z"/><path fill="#8CCAF7" d="M29 5l-4-5H11L7 5h11z"/><path fill="#5DADEC" d="M29 5l-4-5h-7v5h1z"/><path fill="#8CCAF7" d="M18 5h11l-11 9z"/><path fill="#9AAAB4" d="M25 13c0 1.657-1.343 3-3 3h-8c-1.657 0-3-1.343-3-3s1.343-3 3-3h8c1.657 0 3 1.343 3 3z"/></svg> \ No newline at end of file |