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/1f318.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/1f318.svg')
-rw-r--r-- | public/emoji/1f318.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f318.svg b/public/emoji/1f318.svg index 0cd9693b5..490baa9ed 100644 --- a/public/emoji/1f318.svg +++ b/public/emoji/1f318.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(0,18)" id="g20"><path id="path22" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-9.941 8.059,-18 18,-18 9.941,0 18,8.059 18,18 C 36,9.941 27.941,18 18,18 8.059,18 0,9.941 0,0"/></g><g transform="translate(36,18)" id="g24"><path id="path26" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-9.941 -8.059,-18 -18,-18 -0.294,0 -0.58,0.029 -0.87,0.043 C -24.761,-15.393 -29,-8.332 -29,0 c 0,8.331 4.239,15.393 10.13,17.956 C -18.58,17.97 -18.294,18 -18,18 -8.059,18 0,9.941 0,0"/></g><g transform="translate(22,27.5)" id="g28"><path id="path30" style="fill:#5b6876;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.933 1.566,-3.5 3.5,-3.5 5.434,-3.5 7,-1.933 7,0 7,1.933 5.434,3.5 3.5,3.5 1.566,3.5 0,1.933 0,0"/></g><g transform="translate(13,20)" id="g32"><path id="path34" style="fill:#5b6876;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.657 1.343,-3 3,-3 4.657,-3 6,-1.657 6,0 6,1.657 4.657,3 3,3 1.343,3 0,1.657 0,0"/></g><g transform="translate(11,8.5)" id="g36"><path id="path38" style="fill:#5b6876;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.934 1.566,-3.5 3.5,-3.5 5.434,-3.5 7,-1.934 7,0 7,1.934 5.434,3.5 3.5,3.5 1.566,3.5 0,1.934 0,0"/></g><g transform="translate(13,30)" id="g40"><path id="path42" style="fill:#5b6876;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.104 0.896,-2 2,-2 3.105,-2 4,-1.104 4,0 4,1.105 3.105,2 2,2 0.896,2 0,1.105 0,0"/></g><g transform="translate(34,18)" id="g44"><path id="path46" style="fill:#5b6876;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 -0.553,0 -1,0.447 -1,1 0,0.552 0.447,1 1,1 0.553,0 1,-0.448 1,-1"/></g><g transform="translate(7,27)" id="g48"><path id="path50" style="fill:#b8c5cd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 -0.553,0 -1,0.447 -1,1 0,0.552 0.447,1 1,1 0.553,0 1,-0.448 1,-1"/></g><g transform="translate(22,5)" id="g52"><path id="path54" style="fill:#5b6876;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 0.553,0 1,-0.447 1,-1"/></g><g transform="translate(2,17)" id="g56"><path id="path58" style="fill:#b8c5cd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.104 0.896,-2 2,-2 3.104,-2 4,-1.104 4,0 4,1.105 3.104,2 2,2 0.896,2 0,1.105 0,0"/></g><g transform="translate(24,13)" id="g60"><path id="path62" style="fill:#5b6876;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.104 0.896,-2 2,-2 3.105,-2 4,-1.104 4,0 4,1.105 3.105,2 2,2 0.896,2 0,1.105 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><circle fill="#CCD6DD" cx="18" cy="18" r="18"/><path fill="#66757F" d="M36 18c0 9.941-8.059 18-18 18-.294 0-.58-.029-.87-.043C11.239 33.393 7 26.332 7 18 7 9.669 11.239 2.607 17.13.044 17.42.03 17.706 0 18 0c9.941 0 18 8.059 18 18z"/><circle fill="#5B6876" cx="25.5" cy="8.5" r="3.5"/><circle fill="#5B6876" cx="16" cy="16" r="3"/><circle fill="#5B6876" cx="14.5" cy="27.5" r="3.5"/><circle fill="#5B6876" cx="15" cy="6" r="2"/><circle fill="#5B6876" cx="33" cy="18" r="1"/><circle fill="#B8C5CD" cx="6" cy="9" r="1"/><circle fill="#5B6876" cx="21" cy="31" r="1"/><circle fill="#B8C5CD" cx="4" cy="19" r="2"/><circle fill="#5B6876" cx="26" cy="23" r="2"/></svg> \ No newline at end of file |