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/1f98d.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/1f98d.svg')
-rw-r--r-- | public/emoji/1f98d.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f98d.svg b/public/emoji/1f98d.svg index 8cf5a02bb..fcfe2cf7f 100644 --- a/public/emoji/1f98d.svg +++ b/public/emoji/1f98d.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(5,20)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,4 -5,3 -4,-1 1,-4 3,-5 3,-5 l 1,6 z"/></g><g transform="translate(31,20)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,4 5,3 4,-1 3,-5 1,-6 1,-6 L 0,0 Z"/></g><g transform="translate(32.6504,14.2637)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-10.892 -4.691,-14.087 -14.65,-14.087 -9.959,0 -14.651,3.195 -14.651,14.087 0,10.893 4.692,21.413 14.651,21.413 C -4.691,21.413 0,10.893 0,0"/></g><g transform="translate(27.5674,13)" id="g32"><path id="path34" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.49,4.458 2.088,7.312 -0.443,7.312 l -18.248,0 c -2.532,0 -1.934,-2.854 -0.444,-7.312 -4.928,-11.201 8.734,-11.823 9.568,-11.823 0.834,0 14.302,1.059 9.567,11.823"/></g><g transform="translate(15,17.9971)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.895,-2 -2,-2 -1.104,0 -2,0.895 -2,2 0,1.105 0.896,1 2,1 1.105,0 2,0.105 2,-1"/></g><g transform="translate(25,17.9971)" id="g40"><path id="path42" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.895,-2 -2,-2 -1.104,0 -2,0.895 -2,2 0,1.105 0.896,1 2,1 1.105,0 2,0.105 2,-1"/></g><g transform="translate(17,12.3447)" id="g44"><path id="path46" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.64,-1 -1.428,-1 -0.789,0 -1.428,0.447 -1.428,1 0,0.553 0.639,1 1.428,1 C -0.64,1 0,0.553 0,0"/></g><g transform="translate(21.8564,12.3447)" id="g48"><path id="path50" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.639,-1 -1.428,-1 -0.79,0 -1.428,0.447 -1.428,1 0,0.553 0.638,1 1.428,1 C -0.639,1 0,0.553 0,0"/></g><g transform="translate(21.0195,14.96)" id="g52"><path id="path54" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.965,0.26 -3.02,-0.834 -3.02,-0.834 0,0 -1.055,1.094 -3.02,0.834 -3.156,-0.417 -3.285,-3.287 -1.939,-3.105 0.766,0.103 0.135,0.938 1.713,1.555 1.579,0.617 3.246,-0.659 3.246,-0.659 0,0 1.668,1.276 3.247,0.659 C 1.806,-2.167 1.174,-3.002 1.941,-3.105 3.286,-3.287 3.158,-0.417 0,0"/></g><g transform="translate(24.835,5.9785)" id="g56"><path id="path58" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.209,-0.323 -3.204,-0.596 -6.835,-0.596 -3.631,0 -5.625,0.273 -6.835,0.596 -3.205,0.854 -1.923,1.735 0,1.477 1.922,-0.259 3.631,-0.415 6.835,-0.415 3.205,0 4.914,0.156 6.835,0.415 C 1.923,1.735 3.204,0.854 0,0"/></g><g transform="translate(4.2534,19.375)" id="g60"><path id="path62" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.403,1.225 -1.078,3.766 -2.196,2.544 -2.537,2.172 -1.274,2.732 -0.859,1.458 -0.553,0.516 -0.859,-0.75 0,0"/></g><g transform="translate(31.7461,19.375)" id="g64"><path id="path66" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.402,1.225 1.078,3.766 2.196,2.544 2.537,2.172 1.275,2.732 0.859,1.458 0.553,0.516 0.859,-0.75 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M5 16c0-4-5-3-4 1s3 5 3 5l1-6zm26 0c0-4 5-3 4 1s-3 5-3 5l-1-6z"/><path fill="#292F33" d="M32.65 21.736c0 10.892-4.691 14.087-14.65 14.087-9.958 0-14.651-3.195-14.651-14.087S8.042.323 18 .323c9.959 0 14.65 10.521 14.65 21.413z"/><path fill="#66757F" d="M27.567 23c1.49-4.458 2.088-7.312-.443-7.312H8.876c-2.532 0-1.933 2.854-.444 7.312C3.504 34.201 17.166 34.823 18 34.823S32.303 33.764 27.567 23z"/><path fill="#292F33" d="M15 18.003c0 1.105-.896 2-2 2s-2-.895-2-2c0-1.104.896-1 2-1s2-.105 2 1zm10 0c0 1.105-.896 2-2 2s-2-.895-2-2c0-1.104.896-1 2-1s2-.105 2 1z"/><ellipse fill="#292F33" cx="15.572" cy="23.655" rx="1.428" ry="1"/><path fill="#292F33" d="M21.856 23.655c0 .553-.639 1-1.428 1-.79 0-1.429-.447-1.429-1 0-.553.639-1 1.429-1s1.428.448 1.428 1z"/><path fill="#99AAB5" d="M21.02 21.04c-1.965-.26-3.02.834-3.02.834s-1.055-1.094-3.021-.834c-3.156.417-3.285 3.287-1.939 3.105.766-.104.135-.938 1.713-1.556 1.579-.616 3.247.66 3.247.66s1.667-1.276 3.246-.659.947 1.452 1.714 1.556c1.346.181 1.218-2.689-1.94-3.106z"/><path fill="#292F33" d="M24.835 30.021c-1.209.323-3.204.596-6.835.596s-5.625-.272-6.835-.596c-3.205-.854-1.923-1.735 0-1.477 1.923.259 3.631.415 6.835.415 3.205 0 4.914-.156 6.835-.415 1.923-.258 3.204.623 0 1.477z"/><path fill="#66757F" d="M4.253 16.625c1.403-1.225-1.078-3.766-2.196-2.544-.341.373.921-.188 1.336 1.086.308.942.001 2.208.86 1.458zm27.493 0c-1.402-1.225 1.078-3.766 2.196-2.544.341.373-.921-.188-1.337 1.086-.306.942 0 2.208-.859 1.458z"/></svg> \ No newline at end of file |