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/1f9e6.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/1f9e6.svg')
-rw-r--r-- | public/emoji/1f9e6.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f9e6.svg b/public/emoji/1f9e6.svg index a9ccf1e84..44fc31080 100644 --- a/public/emoji/1f9e6.svg +++ b/public/emoji/1f9e6.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,16.7243)" id="g20"><path id="path22" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.983,0 -1.893,-0.294 -2.667,-0.784 l 0,-4.549 -2.299,0 C -4.792,-7.936 -2.647,-10 0,-10 c 2.761,0 5,2.239 5,5 L 5,0 0,0 Z"/></g><g transform="translate(22.9945,13)" id="g24"><path id="path26" style="fill:#1c6399;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.006,16 9,0 L 9,0 0,0 Z"/></g><g transform="translate(23.6765,1.318)" id="g28"><path id="path30" style="fill:#1c6399;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -6.354,6.354 0.527,13.229 6.881,6.875 0,0 Z"/></g><g transform="translate(30,32)" id="g32"><path id="path34" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5,0 c -1.1,0 -2,-0.9 -2,-2 l 0,-2 9,0 0,2 C 2,-0.9 1.1,0 0,0"/></g><g transform="translate(15,20.7243)" id="g36"><path id="path38" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.983,0 -1.893,-0.294 -2.667,-0.784 l 0,-4.549 -2.299,0 C -4.792,-7.936 -2.647,-10 0,-10 c 2.761,0 5,2.239 5,5 L 5,0 0,0 Z"/></g><g transform="translate(10.9945,17)" id="g40"><path id="path42" style="fill:#1c6399;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.006,16 9,0 L 9,0 0,0 Z"/></g><g transform="translate(23.6765,1.318)" id="g44"><path id="path46" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.757,-1.757 -4.607,-1.757 -6.364,0 -1.757,1.757 -1.757,4.607 0,6.364 0,0 1.149,-0.133 3.69,-2.674 C -0.133,1.149 0,0 0,0"/></g><g transform="translate(18,36)" id="g48"><path id="path50" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5,0 c -1.1,0 -2,-0.9 -2,-2 l 0,-2 9,0 0,2 C 2,-0.9 1.1,0 0,0"/></g><g transform="translate(11.6765,5.318)" id="g52"><path id="path54" style="fill:#1c6399;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -6.354,6.354 0.527,13.229 6.881,6.875 0,0 Z"/></g><g transform="translate(11.6765,5.318)" id="g56"><path id="path58" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.757,-1.757 -4.607,-1.757 -6.364,0 -1.757,1.757 -1.757,4.607 0,6.364 0,0 1.149,-0.133 3.69,-2.674 C -0.133,1.149 0,0 0,0"/></g><path id="path60" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 22.994,23.933 9,0 0,2 -9,0 0,-2 z"/><path id="path62" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 22.994,19.933 9,0 0,2 -9,0 0,-2 z"/><path id="path64" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 10.994,27.933 9,0 0,2 -9,0 0,-2 z"/><path id="path66" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 10.994,23.933 9,0 0,2 -9,0 0,-2 z"/></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#55ACEE" d="M27 19.276c-.983 0-1.893.294-2.667.784v4.549h-2.3c.175 2.603 2.319 4.667 4.966 4.667 2.761 0 5-2.239 5-5v-5H27z"/><path fill="#1C6399" d="M22.995 22.999l.005-16 9 .003-.005 16z"/><path fill="#1C6399" d="M24.202 21.451l6.354 6.354-6.878 6.878-6.354-6.354z"/><path fill="#55ACEE" d="M30 4h-5c-1.1 0-2 .9-2 2v2h9V6c0-1.1-.9-2-2-2zM15 15.276c-.983 0-1.893.294-2.667.784v4.549h-2.3c.175 2.603 2.319 4.667 4.966 4.667 2.761 0 5-2.239 5-5v-5H15z"/><path fill="#1C6399" d="M10.994 18.999l.006-16 9 .003-.006 16z"/><path fill="#55ACEE" d="M23.676 34.682c-1.757 1.757-4.607 1.757-6.364 0s-1.757-4.607 0-6.364c0 0 1.149.133 3.69 2.674s2.674 3.69 2.674 3.69zM18 0h-5c-1.1 0-2 .9-2 2v2h9V2c0-1.1-.9-2-2-2z"/><path fill="#1C6399" d="M12.202 17.451l6.354 6.354-6.878 6.878-6.354-6.354z"/><path fill="#55ACEE" d="M11.676 30.682c-1.757 1.757-4.607 1.757-6.364 0s-1.757-4.607 0-6.364c0 0 1.149.133 3.69 2.674s2.674 3.69 2.674 3.69z"/><path fill="#FFCC4D" d="M22.994 10.067h9v2h-9zm0 4h9v2h-9zm-12-8h9v2h-9zm0 4h9v2h-9z"/></svg> \ No newline at end of file |