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/1f527.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/1f527.svg')
-rw-r--r-- | public/emoji/1f527.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f527.svg b/public/emoji/1f527.svg index 26775fd0a..73a06d0da 100644 --- a/public/emoji/1f527.svg +++ b/public/emoji/1f527.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(27.9888,16.0233)" id="g20"><path id="path22" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.622,0 -1.225,-0.078 -1.806,-0.213 l -10.372,10.372 c 0.134,0.581 0.212,1.184 0.212,1.806 0,4.425 -3.587,8.012 -8.011,8.012 -0.902,0 -2.102,-0.916 -1.103,-1.915 l 2.997,-2.997 c 0,0 0.998,-1.997 -0.999,-3.995 -1.998,-1.998 -3.996,-0.999 -3.996,-0.999 l -2.996,2.997 c -0.999,0.999 -1.915,-0.196 -1.915,-1.103 0,-4.425 3.587,-8.012 8.012,-8.012 0.622,0 1.225,0.078 1.806,0.213 L -7.799,-6.206 c -0.135,-0.581 -0.213,-1.184 -0.213,-1.806 0,-4.425 3.587,-8.011 8.012,-8.011 0.901,0 2.101,0.916 1.102,1.914 l -2.996,2.997 c 0,0 -0.999,1.998 0.999,3.995 1.997,1.998 3.995,0.999 3.995,0.999 l 2.996,-2.996 c 0.999,-0.999 1.915,0.196 1.915,1.102 C 8.011,-3.588 4.425,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#8899A6" d="M27.989 19.977c-.622 0-1.225.078-1.806.213L15.811 9.818c.134-.581.212-1.184.212-1.806C16.023 3.587 12.436 0 8.012 0 7.11 0 5.91.916 6.909 1.915l2.997 2.997s.999 1.998-.999 3.995-3.996.998-3.996.998L1.915 6.909C.916 5.91 0 7.105 0 8.012c0 4.425 3.587 8.012 8.012 8.012.622 0 1.225-.078 1.806-.212l10.371 10.371c-.135.581-.213 1.184-.213 1.806 0 4.425 3.588 8.011 8.012 8.011.901 0 2.101-.916 1.102-1.915l-2.997-2.997s-.999-1.998.999-3.995 3.995-.999 3.995-.999l2.997 2.997c1 .999 1.916-.196 1.916-1.102 0-4.425-3.587-8.012-8.011-8.012z"/></svg> \ No newline at end of file |