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/1f459.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/1f459.svg')
-rw-r--r-- | public/emoji/1f459.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f459.svg b/public/emoji/1f459.svg index 6480f8f85..ed327f108 100644 --- a/public/emoji/1f459.svg +++ b/public/emoji/1f459.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(29,11)" id="g20"><path id="path22" style="fill:#553788;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -4,-1 -11,-1 -7,0 -11,1 -11,1 0,0 6,-5 11,-5 5,0 11,5 11,5"/></g><g transform="translate(18,18.1436)" id="g24"><path id="path26" style="fill:#553788;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -5.514,0 -10,4.515 -10,10.063 0,2.858 1.214,5.591 3.331,7.499 l 1.338,-1.485 C -7.027,14.547 -8,12.355 -8,10.063 -8,5.617 -4.411,2 0,2 c 4.411,0 8,3.617 8,8.063 0,2.292 -0.973,4.483 -2.669,6.013 l 1.34,1.485 C 8.786,15.653 10,12.92 10,10.063 10,4.515 5.514,0 0,0"/></g><g transform="translate(16.625,19.1436)" id="g28"><path id="path30" style="fill:#744eaa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -5.417,3.856 -7.732,11.33 -7.917,11.148 -12.15,5.665 -9.941,1.133 -7.732,-3.398 0,0 0,0"/></g><g transform="translate(19.4395,19.1436)" id="g32"><path id="path34" style="fill:#744eaa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 5.478,4.731 7.732,11.33 7.894,11.023 12.15,5.665 9.941,1.133 7.732,-3.398 0,0 0,0"/></g><g transform="translate(29,11)" id="g36"><path id="path38" style="fill:#744eaa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -4,-3 -11,-3 -7,0 -11,3 -11,3 0,0 7.208,-5.625 9,-11 l 4,0 c 1.958,6.625 9,11 9,11"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#553788" d="M29 25s-4 1-11 1-11-1-11-1 6 5 11 5 11-5 11-5zm-11-7.144c-5.514 0-10-4.515-10-10.063C8 4.935 9.214 2.202 11.331.294l1.339 1.485C10.973 3.309 10 5.501 10 7.793c0 4.446 3.589 8.063 8 8.063s8-3.617 8-8.063c0-2.292-.973-4.483-2.669-6.012l1.34-1.485C26.786 2.203 28 4.936 28 7.793c0 5.549-4.486 10.063-10 10.063z"/><path fill="#744EAA" d="M16.625 16.856S11.208 13 8.893 5.526c-.184.182-4.418 5.665-2.209 10.197 2.209 4.532 9.941 1.133 9.941 1.133zm2.815 0s5.477-4.731 7.732-11.33c.161.307 4.418 5.665 2.209 10.197-2.209 4.532-9.941 1.133-9.941 1.133zM29 25s-4 3-11 3-11-3-11-3 7.208 5.625 9 11h4c1.958-6.625 9-11 9-11z"/></svg> \ No newline at end of file |