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/1f6b0.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/1f6b0.svg')
-rw-r--r-- | public/emoji/1f6b0.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f6b0.svg b/public/emoji/1f6b0.svg index 19c4240e9..40f577463 100644 --- a/public/emoji/1f6b0.svg +++ b/public/emoji/1f6b0.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,32)" id="g20"><path id="path22" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,4 4,4 4,4 l 28,0 c 0,0 4,0 4,-4 l 0,-28 c 0,0 0,-4 -4,-4 l -28,0 c 0,0 -4,0 -4,4 L 0,0 Z"/></g><g transform="translate(33,27)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -11,0 0,4.5 0,1.5 c 0,0 0,1 -1,1 -1,0 -1,-1 -1,-1 l 0,-1.5 0,-4.5 c -8,0 -8,-7 -8,-7 l 0,-2 c 0,-1 1,-1 1,-1 l 3,0 c 0,0 1,0 1,1 l 0,0.25 0,0.062 0,1.688 c 0,2 2,2 2,2 l 14,0 c 1,0 1,1 1,1 l 0,3 c 0,0 0,1 -1,1"/></g><g transform="translate(18.5,33)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -3,0 C -3.829,0 -4.5,-0.671 -4.5,-1.5 -4.5,-2.329 -3.829,-3 -3,-3 l 3,0 c 0.828,0 1.5,0.671 1.5,1.5 C 1.5,-0.671 0.828,0 0,0"/></g><g transform="translate(23.5,30)" id="g32"><path id="path34" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 3,0 C 3.828,0 4.5,0.671 4.5,1.5 4.5,2.329 3.828,3 3,3 L 0,3 C -0.828,3 -1.5,2.329 -1.5,1.5 -1.5,0.671 -0.828,0 0,0"/></g><g transform="translate(20,16)" id="g36"><path id="path38" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1,0 -1,-1 -1,-1 l 0,-5 -9,0 0,5 c 0,0 0,1 -1,1 -1,0 -1,-1 -1,-1 l 0,-11 c 0,0 0,-2 2,-2 l 9,0 c 2,0 2,2 2,2 l 0,11 c 0,0 0,1 -1,1"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#269" d="M0 4c0-4 4-4 4-4h28s4 0 4 4v28s0 4-4 4H4s-4 0-4-4V4z"/><g fill="#FFF"><path d="M33 9H22V3s0-1-1-1-1 1-1 1v6c-8 0-8 7-8 7v2c0 1 1 1 1 1h3s1 0 1-1v-2c0-2 2-2 2-2h14c1 0 1-1 1-1v-3s0-1-1-1z"/><path d="M18.5 3h-3c-.829 0-1.5.671-1.5 1.5S14.671 6 15.5 6h3c.828 0 1.5-.671 1.5-1.5S19.328 3 18.5 3zm5 3h3c.828 0 1.5-.671 1.5-1.5S27.328 3 26.5 3h-3c-.828 0-1.5.671-1.5 1.5S22.672 6 23.5 6z"/></g><path fill="#FFF" d="M20 20c-1 0-1 1-1 1v5h-9v-5s0-1-1-1-1 1-1 1v11s0 2 2 2h9c2 0 2-2 2-2V21s0-1-1-1z"/></svg> \ No newline at end of file |