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/1f963.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/1f963.svg')
-rw-r--r-- | public/emoji/1f963.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f963.svg b/public/emoji/1f963.svg index c5d61ee6c..00e5ae6fa 100644 --- a/public/emoji/1f963.svg +++ b/public/emoji/1f963.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(16,5)" id="g20"><path id="path22" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 8.837,0 16,7.163 16,16 l -32,0 C -16,7.163 -8.836,0 0,0"/></g><g transform="translate(30.1748,21.9375)" id="g24"><path id="path26" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.831 -6.346,-6.937 -14.175,-6.937 -7.829,0 -14.175,3.106 -14.175,6.937 0,3.831 6.346,6.937 14.175,6.937 C -6.346,6.937 0,3.831 0,0"/></g><g transform="translate(32.0508,21)" id="g28"><path id="path30" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.924 -7.186,-8.917 -16.051,-8.917 -8.865,0 -16.051,3.993 -16.051,8.917 0,4.924 7.186,8.917 16.051,8.917 C -7.186,8.917 0,4.924 0,0"/></g><g transform="translate(30.6413,21)" id="g32"><path id="path34" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.263 -6.554,-7.719 -14.641,-7.719 -8.087,0 -14.642,3.456 -14.642,7.719 0,4.263 6.555,7.719 14.642,7.719 C -6.554,7.719 0,4.263 0,0"/></g><g transform="translate(21,18.5)" id="g36"><path id="path38" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.485 -3.582,-4.5 -8,-4.5 -4.418,0 -8,2.015 -8,4.5 0,2.485 3.582,4.5 8,4.5 4.418,0 8,-2.015 8,-4.5"/></g><g transform="translate(18,17)" id="g40"><path id="path42" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.381 -2.239,-2.5 -5,-2.5 -2.761,0 -5,1.119 -5,2.5 0,1.381 2.239,2.5 5,2.5 2.761,0 5,-1.119 5,-2.5"/></g><g transform="translate(18.4043,21.8135)" id="g44"><path id="path46" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 3.07,-1.208 7.596,2.186 4,3 7,4 8,4 2,0 2,-3 0,-3 -2,0 -4,-1 -7,-3 -2.354,-1.568 -7.349,-6 -7.349,-6 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#A0041E" d="M16 31c8.837 0 16-7.163 16-16H0c0 8.837 7.164 16 16 16z"/><ellipse fill="#EA596E" cx="16" cy="15" rx="16.051" ry="8.917"/><ellipse fill="#662113" cx="16" cy="15" rx="14.641" ry="7.719"/><path fill="#99AAB5" d="M34 8c-1 0-4 1-8 4-4.525 3.394-7.596 2.187-7.596 2.187l.001.003C16.981 13.453 15.087 13 13 13c-4.418 0-8 2.015-8 4.5S8.582 22 13 22c2.773 0 5.216-.794 6.651-2 0 0 4.995-4.431 7.349-6 3-2 5-3 7-3s2-3 0-3z"/><ellipse fill="#CCD6DD" cx="13" cy="19" rx="5" ry="2.5"/></svg> \ No newline at end of file |