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/1f505.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/1f505.svg')
-rw-r--r-- | public/emoji/1f505.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f505.svg b/public/emoji/1f505.svg index 060996279..998b8f43e 100644 --- a/public/emoji/1f505.svg +++ b/public/emoji/1f505.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,12)" id="g20"><path id="path22" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.314,0 -6,2.686 -6,5.999 0,3.314 2.686,6 6,6 3.314,0 6,-2.686 6,-6 C 6,2.686 3.314,0 0,0 M 0,16 C -5.523,16 -10,11.523 -10,5.999 -10,0.477 -5.523,-4 0,-4 5.523,-4 10,0.477 10,5.999 10,11.523 5.523,16 0,16"/></g><g transform="translate(20,30.9995)" id="g24"><path id="path26" style="fill:#ffac33;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(20,5)" id="g28"><path id="path30" style="fill:#ffac33;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,2 2,2 1.105,0 2,-0.895 2,-2"/></g><g transform="translate(10.2217,28.606)" id="g32"><path id="path34" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.781,0.781 -2.047,0.781 -2.828,0 -0.781,-0.781 -0.781,-2.047 0,-2.828 0.781,-0.781 2.047,-0.781 2.828,0 0.781,0.781 0.781,2.047 0,2.828"/></g><g transform="translate(28.6064,10.2217)" id="g36"><path id="path38" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.781,-0.78 0.781,-2.048 0,-2.828 -0.781,-0.781 -2.047,-0.78 -2.828,0 -0.781,0.781 -0.781,2.047 0,2.828 0.781,0.78 2.047,0.781 2.828,0"/></g><g transform="translate(5.0005,20)" id="g40"><path id="path42" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.104,0 -2,-0.895 -2,-2 0,-1.104 0.896,-2 2,-2 1.104,0 2,0.896 2,2 0,1.105 -0.896,2 -2,2"/></g><g transform="translate(31,20)" id="g44"><path id="path46" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.105,0 2,-0.895 2,-2 0,-1.104 -0.895,-2 -2,-2 -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2"/></g><g transform="translate(28.6055,25.7783)" id="g48"><path id="path50" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.781,0.781 0.781,2.047 0.001,2.828 -0.781,0.781 -2.048,0.781 -2.829,0 C -3.608,2.047 -3.609,0.781 -2.828,0 -2.047,-0.781 -0.78,-0.781 0,0"/></g><g transform="translate(10.2217,7.3936)" id="g52"><path id="path54" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.781,-0.781 -2.047,-0.781 -2.828,0 -0.781,0.781 -0.781,2.047 0,2.828 0.781,0.781 2.047,0.781 2.828,0 C 0.781,2.047 0.781,0.781 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFAC33" d="M18 8C12.477 8 8 12.477 8 18s4.477 10 10 10 10-4.477 10-10S23.523 8 18 8zm0 16c-3.314 0-6-2.685-6-6 0-3.313 2.686-6 6-6s6 2.687 6 6c0 3.315-2.687 6-6 6z"/><circle fill="#FFAC33" cx="18" cy="5" r="2"/><circle fill="#FFAC33" cx="18" cy="31" r="2"/><path fill="#FFAC33" d="M10.222 7.394c-.781-.781-2.047-.781-2.828 0-.781.781-.781 2.047 0 2.829.781.781 2.047.781 2.828 0 .781-.782.781-2.048 0-2.829zm18.384 18.384c.781.78.781 2.048 0 2.828-.781.781-2.047.78-2.828 0-.781-.781-.781-2.047 0-2.828.782-.78 2.047-.781 2.828 0z"/><circle fill="#FFAC33" cx="5" cy="18" r="2"/><circle fill="#FFAC33" cx="31" cy="18" r="2"/><path fill="#FFAC33" d="M28.605 10.222c.781-.781.781-2.047.001-2.828-.781-.781-2.048-.781-2.829 0-.78.781-.781 2.047 0 2.828.782.781 2.048.781 2.828 0zM10.222 28.606c-.781.781-2.047.781-2.828 0-.781-.781-.781-2.047 0-2.828.781-.781 2.047-.781 2.828 0 .78.782.781 2.047 0 2.828z"/></svg> \ No newline at end of file |