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/1f35a.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/1f35a.svg')
-rw-r--r-- | public/emoji/1f35a.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f35a.svg b/public/emoji/1f35a.svg index ebbc452f5..04019a1c9 100644 --- a/public/emoji/1f35a.svg +++ b/public/emoji/1f35a.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(18,0)" id="g20"><path id="path22" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -14.958,0 -17,15 -17,19 l 34,0 C 17,17 15.042,0 0,0"/></g><g transform="translate(35,18.9443)" id="g24"><path id="path26" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-5.216 -7.611,-9.444 -17,-9.444 -9.389,0 -17,4.228 -17,9.444 0,5.216 7.611,9.444 17,9.444 C -7.611,9.444 0,5.216 0,0"/></g><g transform="translate(18,11)" id="g28"><path id="path30" style="fill:#e6e9ea;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -6,0 -16,3 -16,8 0,6 6.125,13 16,13 C 9.875,21 16,13 16,8 16,3 7,0 0,0"/></g><g transform="translate(15.4102,16.1084)" id="g32"><path id="path34" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.419,-0.359 0.468,-0.991 0.108,-1.41 -0.359,-0.419 -0.99,-0.468 -1.41,-0.109 l -1.518,1.302 c -0.419,0.36 -0.468,0.991 -0.109,1.41 0.36,0.419 0.991,0.468 1.41,0.109 L 0,0 Z"/></g><g transform="translate(7.2827,17.6152)" id="g36"><path id="path38" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.304,-0.46 -0.925,-0.587 -1.386,-0.283 -0.46,0.304 -0.587,0.925 -0.282,1.386 l 1.102,1.668 C -0.261,3.232 0.359,3.359 0.82,3.054 1.28,2.749 1.407,2.129 1.103,1.669 L 0,0 Z"/></g><g transform="translate(30.2832,17.6152)" id="g40"><path id="path42" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.305,-0.46 -0.926,-0.587 -1.387,-0.283 -0.46,0.304 -0.587,0.925 -0.282,1.386 l 1.103,1.668 C -0.262,3.232 0.359,3.359 0.819,3.054 1.279,2.749 1.406,2.129 1.102,1.669 L 0,0 Z"/></g><g transform="translate(24.1797,21.2207)" id="g44"><path id="path46" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.11,-0.54 -0.239,-1.069 -0.78,-1.18 -0.541,-0.11 -1.07,0.24 -1.18,0.781 l -0.399,1.96 C -2.47,2.102 -2.121,2.629 -1.579,2.74 -1.038,2.851 -0.51,2.501 -0.4,1.96 L 0,0 Z"/></g><g transform="translate(16.6401,25.1792)" id="g48"><path id="path50" 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.14,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.483 1.594,-0.649 1.249,-0.509 L 0,0 Z"/></g><g transform="translate(7.3442,23.6123)" id="g52"><path id="path54" 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(20.9365,15.0674)" id="g56"><path id="path58" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.551,0.036 -0.969,0.513 -0.933,1.064 0.037,0.55 0.513,0.969 1.063,0.933 L 2.127,1.866 C 2.677,1.831 3.096,1.355 3.06,0.804 3.024,0.253 2.549,-0.166 1.997,-0.129 L 0,0 Z"/></g><g transform="translate(11.6963,21.4526)" id="g60"><path id="path62" 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(27.6406,24.1792)" id="g64"><path id="path66" 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></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#DD2E44" d="M18 36C3.042 36 1 21 1 17h34c0 2-1.958 19-17 19z"/><ellipse fill="#A0041E" cx="18" cy="17.056" rx="17" ry="9.444"/><path fill="#E6E9EA" d="M18 25c-6 0-16-3-16-8C2 11 8.125 4 18 4s16 8 16 13-9 8-16 8z"/><path d="M15.41 19.892c.419.359.468.991.108 1.41-.359.419-.991.468-1.41.108l-1.519-1.302c-.419-.359-.468-.991-.108-1.41.359-.419.991-.468 1.41-.108l1.519 1.302zm-8.127-1.507c-.304.46-.925.587-1.386.283-.46-.305-.587-.925-.283-1.386l1.103-1.669c.305-.461.925-.587 1.386-.283.46.305.587.925.283 1.386l-1.103 1.669zm23 0c-.305.46-.926.587-1.387.283-.46-.305-.587-.925-.282-1.386l1.103-1.669c.305-.461.926-.587 1.386-.283.46.305.587.925.283 1.386l-1.103 1.669zm-6.103-3.606c.11.541-.239 1.069-.78 1.18-.541.11-1.069-.239-1.18-.78l-.399-1.96c-.11-.541.238-1.069.78-1.179.541-.111 1.069.239 1.179.78l.4 1.959zm-7.54-3.958c-.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.37l-1.248-.508zm-9.296 1.567c-.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.761zm13.593 8.545c-.551-.036-.969-.513-.933-1.064.037-.55.513-.968 1.062-.933l1.997.131c.55.035.969.512.933 1.062-.035.551-.511.97-1.062.933l-1.997-.129zm-9.241-6.386c-.512-.208-.758-.793-.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-.754zm15.945-2.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-.508z" fill="#CCD6DD"/></svg> \ No newline at end of file |