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/1f35b.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/1f35b.svg')
-rw-r--r-- | public/emoji/1f35b.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f35b.svg b/public/emoji/1f35b.svg index f26558101..be3be2261 100644 --- a/public/emoji/1f35b.svg +++ b/public/emoji/1f35b.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(36,13)" id="g20"><path id="path22" style="fill:#939598;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-5.523 -8.059,-10 -18,-10 -9.941,0 -18,4.477 -18,10 0,5.523 8.059,10 18,10 C -8.059,10 0,5.523 0,0"/></g><g transform="translate(36,15)" id="g24"><path id="path26" style="fill:#f1f2f2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-5.523 -8.059,-10 -18,-10 -9.941,0 -18,4.477 -18,10 0,5.523 8.059,10 18,10 C -8.059,10 0,5.523 0,0"/></g><g transform="translate(32.7998,15.3887)" id="g28"><path id="path30" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.202 -6.626,-7.611 -14.8,-7.611 -8.174,0 -14.8,3.409 -14.8,7.611 0,4.203 6.626,7.611 14.8,7.611 C -6.626,7.611 0,4.203 0,0"/></g><g transform="translate(13,12)" id="g32"><path id="path34" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.75,0 -10,2.063 -10,5.5 0,4.125 3.828,8.938 10,8.938 6.172,0 10,-5.5 10,-8.938 C 10,2.063 4.375,0 0,0"/></g><g transform="translate(4.6401,17.1792)" id="g36"><path id="path38" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.345,0.14 -0.511,0.534 -0.37,0.879 0.141,0.344 0.535,0.51 0.879,0.37 L 1.758,0.74 C 2.103,0.6 2.268,0.206 2.128,-0.139 1.987,-0.484 1.594,-0.65 1.249,-0.509 L 0,0 Z"/></g><g transform="translate(8.3442,20.6123)" id="g40"><path id="path42" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.307,-0.211 -0.727,-0.133 -0.937,0.175 -0.21,0.307 -0.132,0.727 0.174,0.937 L 0.351,1.874 C 0.657,2.085 1.077,2.007 1.288,1.7 1.498,1.393 1.419,0.973 1.112,0.762 L 0,0 Z"/></g><g transform="translate(17.3442,15.6123)" id="g44"><path id="path46" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.307,-0.211 -0.727,-0.133 -0.937,0.175 -0.21,0.306 -0.132,0.727 0.174,0.937 L 0.351,1.874 C 0.657,2.085 1.077,2.007 1.288,1.7 1.498,1.393 1.419,0.973 1.112,0.763 L 0,0 Z"/></g><g transform="translate(11.6963,17.4526)" id="g48"><path id="path50" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.512,0.208 -0.758,0.792 -0.549,1.304 0.209,0.51 0.793,0.757 1.304,0.549 L 2.607,1.097 C 3.118,0.889 3.364,0.306 3.156,-0.206 2.948,-0.717 2.364,-0.963 1.852,-0.754 L 0,0 Z"/></g><g transform="translate(16.6406,21.1792)" id="g52"><path id="path54" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.346,0.14 -0.512,0.534 -0.37,0.879 0.14,0.344 0.534,0.51 0.878,0.37 L 1.758,0.74 C 2.102,0.6 2.268,0.206 2.127,-0.139 1.986,-0.483 1.594,-0.649 1.248,-0.509 L 0,0 Z"/></g><g transform="translate(10.9067,15.418)" id="g56"><path id="path58" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.348,0.133 0.738,-0.042 0.871,-0.391 1.002,-0.737 0.827,-1.128 0.479,-1.259 l -1.261,-0.48 c -0.346,-0.133 -0.736,0.042 -0.868,0.39 -0.134,0.349 0.041,0.738 0.39,0.871 L 0,0 Z"/></g><g transform="translate(30,17)" id="g60"><path id="path62" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -1,0 c -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 l 1,0 C -0.895,2 0,1.105 0,0"/></g><g transform="translate(27,12.5)" id="g64"><path id="path66" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.828 -0.672,-1.5 -1.5,-1.5 l -1,0 c -0.828,0 -1.5,0.672 -1.5,1.5 0,0.828 0.672,1.5 1.5,1.5 l 1,0 C -0.672,1.5 0,0.828 0,0"/></g><g transform="translate(21,10)" id="g68"><path id="path70" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -1,0 c -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 l 1,0 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"><ellipse fill="#939598" cx="18" cy="23" rx="18" ry="10"/><ellipse fill="#F1F2F2" cx="18" cy="21" rx="18" ry="10"/><ellipse fill="#F4900C" cx="18" cy="20.611" rx="14.8" ry="7.611"/><path fill="#EEE" d="M13 24c-3.75 0-10-2.062-10-5.5 0-4.125 3.828-8.938 10-8.938 6.172 0 10 5.5 10 8.938S17.375 24 13 24z"/><path fill="#CCD6DD" d="M4.64 18.821c-.345-.14-.511-.534-.37-.879.14-.344.534-.51.878-.37l1.249.509c.345.14.51.533.37.878-.141.345-.534.511-.879.371l-1.248-.509zm3.704-3.433c-.307.211-.727.133-.938-.175-.21-.307-.132-.727.175-.937l1.113-.762c.307-.21.726-.132.937.175.21.307.132.727-.175.938l-1.112.761zm9 5c-.307.211-.727.133-.938-.175-.21-.307-.132-.728.175-.938l1.113-.762c.307-.211.726-.132.937.175.21.307.132.727-.175.937l-1.112.763zm-5.648-1.841c-.512-.208-.758-.792-.549-1.304.209-.511.793-.757 1.304-.549l1.853.755c.511.208.757.791.549 1.303-.208.512-.792.758-1.304.549l-1.853-.754zm4.945-3.726c-.346-.14-.512-.534-.37-.879.14-.344.534-.51.878-.37l1.25.509c.344.14.51.533.369.878-.141.345-.533.511-.879.37l-1.248-.508zm-5.734 5.761c.348-.133.738.042.871.391.132.347-.044.737-.392.868l-1.261.481c-.346.133-.736-.042-.868-.391-.134-.349.041-.737.39-.871l1.26-.478z"/><path fill="#FFD983" d="M30 19c0 1.104-.896 2-2 2h-1c-1.104 0-2-.896-2-2s.896-2 2-2h1c1.104 0 2 .896 2 2zm-3 4.5c0 .828-.672 1.5-1.5 1.5h-1c-.828 0-1.5-.672-1.5-1.5s.672-1.5 1.5-1.5h1c.828 0 1.5.672 1.5 1.5zM21 26c0 .553-.447 1-1 1h-1c-.553 0-1-.447-1-1 0-.553.447-1 1-1h1c.553 0 1 .447 1 1z"/></svg> \ No newline at end of file |