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/1f6c0-1f3fb.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/1f6c0-1f3fb.svg')
-rw-r--r-- | public/emoji/1f6c0-1f3fb.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f6c0-1f3fb.svg b/public/emoji/1f6c0-1f3fb.svg index 8f47a3cfa..ad93c8c61 100644 --- a/public/emoji/1f6c0-1f3fb.svg +++ b/public/emoji/1f6c0-1f3fb.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(11,19)" id="g20"><path id="path22" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1,-3 0.209,-5 -2,-5 -2.209,0 -5.012,2.024 -6,4 -1,2 0.904,4.301 3,5 3,1 4.368,-2.102 5,-4"/></g><g transform="translate(9,23.0005)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0.999 -3,2 -6,-1 -3,-3 1.021,-5.001 1.021,-5.001 0,0 3.979,-3 2.979,0 -1,3 2,5.002 2,6.001"/></g><g transform="translate(30,20)" id="g28"><path id="path30" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.552 0.896,-1 2,-1 3.105,-1 4,-0.552 4,0 4,0.552 3.105,1 2,1 0.896,1 0,0.552 0,0"/></g><g transform="translate(33,15)" id="g32"><path id="path34" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.447 -1,1 l 0,16 c 0,1.582 -1.962,2 -3,2 -1.038,0 -3,-0.418 -3,-2 0,-0.552 -0.447,-1 -1,-1 -0.553,0 -1,0.448 -1,1 0,2.626 2.516,4 5,4 2.484,0 5,-1.374 5,-4 L 1,1 C 1,0.447 0.553,0 0,0"/></g><g transform="translate(28,30)" id="g36"><path id="path38" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -1.343,-1 -3,-1 -1.657,0 -3,-0.104 -3,1 0,1.105 1.343,2 3,2 1.657,0 3,-0.895 3,-2"/></g><g transform="translate(29,29)" id="g40"><path id="path42" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 l -6,0 c -0.553,0 -1,0.448 -1,1 0,0.552 0.447,1 1,1 l 6,0 C -0.447,1 0,0.552 0,0"/></g><g transform="translate(14,2)" id="g44"><path id="path46" style="fill:#99aab5;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.104 0.896,2 2,2 1.105,0 2,-0.896 2,-2"/></g><g transform="translate(30,2)" id="g48"><path id="path50" style="fill:#99aab5;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.104 0.896,2 2,2 1.105,0 2,-0.896 2,-2"/></g><g transform="translate(30,2)" id="g52"><path id="path54" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -18,0 c -5,0 -10,6 -11,14 -0.248,1.984 0.812,1 3.021,1 0,0 12.979,-2 25.979,-2 2,0 5,1.209 5,-1 C 5,12 4,0 0,0"/></g><g transform="translate(36,15)" id="g56"><path id="path58" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -34,2 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L -1,1 C -0.447,1 0,0.553 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F7DECE" d="M11 17c1 3 .209 5-2 5s-5.012-2.024-6-4c-1-2 .904-4.301 3-5 3-1 4.368 2.102 5 4z"/><path fill="#292F33" d="M9 13c0-1-3-2-6 1s1.021 5 1.021 5S8 22 7 19s2-5.001 2-6z"/><ellipse fill="#99AAB5" cx="32" cy="16" rx="2" ry="1"/><path fill="#CCD6DD" d="M33 21c-.553 0-1-.447-1-1V4c0-1.582-1.962-2-3-2s-3 .418-3 2c0 .552-.447 1-1 1s-1-.448-1-1c0-2.626 2.516-4 5-4s5 1.374 5 4v16c0 .553-.447 1-1 1z"/><path fill="#99AAB5" d="M28 6c0 1.104-1.343 1-3 1s-3 .104-3-1 1.343-2 3-2 3 .896 3 2z"/><path fill="#CCD6DD" d="M29 7c0 .552-.447 1-1 1h-6c-.553 0-1-.448-1-1s.447-1 1-1h6c.553 0 1 .448 1 1z"/><circle fill="#99AAB5" cx="12" cy="34" r="2"/><circle fill="#99AAB5" cx="28" cy="34" r="2"/><path fill="#CCD6DD" d="M30 34H12C7 34 2 28 1 20c-.248-1.984.812-1 3.021-1C4.021 19 17 21 30 21c2 0 5-1.209 5 1 0 0-1 12-5 12z"/><path fill="#99AAB5" d="M36 21c0 .553-.447 1-1 1L1 20c-.552 0-1-.447-1-1 0-.553.448-1 1-1l34 2c.553 0 1 .447 1 1z"/></svg> \ No newline at end of file |