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/1f1ff-1f1e6.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/1f1ff-1f1e6.svg')
-rw-r--r-- | public/emoji/1f1ff-1f1e6.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1ff-1f1e6.svg b/public/emoji/1f1ff-1f1e6.svg index cb41b2ef6..275c136da 100644 --- a/public/emoji/1f1ff-1f1e6.svg +++ b/public/emoji/1f1ff-1f1e6.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(32,31)" id="g20"><path id="path22" style="fill:#de3830;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -25.5,0 -13,-8.5 4,-8.5 4,-4 C 4,-1.791 2.209,0 0,0"/></g><g transform="translate(6.5,5)" id="g24"><path id="path26" style="fill:#002395;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 25.5,0 c 2.209,0 4,1.791 4,4 l 0,4.5 -17,0 L 0,0 Z"/></g><g transform="translate(0,25)" id="g28"><path id="path30" style="fill:#141414;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,-14 10.5,-7 0,0 Z"/></g><g transform="translate(0,27)" id="g32"><path id="path34" style="fill:#ffb611;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,-2 10.5,-9 0,-16 0,-18 13.5,-9 0,0 Z"/></g><g transform="translate(3.5405,30.9716)" id="g36"><path id="path38" style="fill:#007a4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.992,-0.228 -3.541,-1.918 -3.541,-3.972 l 13.5,-9 -13.5,-9 c 0,-2.053 1.549,-3.743 3.541,-3.971 l 14.959,10.471 17.5,0 0,5 -17.5,0 L 0,0 Z"/></g><g transform="translate(6.5,31)" id="g40"><path id="path42" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2.5,0 C -2.656,0 -2.808,-0.011 -2.959,-0.028 L 12,-10.5 l 17.5,0 0,2 -17,0 L 0,0 Z"/></g><g transform="translate(3.5405,5.0284)" id="g44"><path id="path46" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.151,-0.017 0.304,-0.028 0.459,-0.028 l 2.5,0 12.5,8.5 17,0 0,2 -17.5,0 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#DE3830" d="M32 5H6.5L19 13.5h17V9c0-2.209-1.791-4-4-4z"/><path fill="#002395" d="M6.5 31H32c2.209 0 4-1.791 4-4v-4.5H19L6.5 31z"/><path fill="#141414" d="M0 11v14l10.5-7z"/><path fill="#FFB611" d="M0 9v2l10.5 7L0 25v2l13.5-9z"/><path fill="#007A4D" d="M3.541 5.028C1.548 5.257 0 6.947 0 9l13.5 9L0 27c0 2.053 1.548 3.743 3.541 3.972L18.5 20.5H36v-5H18.5L3.541 5.028z"/><path fill="#EEE" d="M6.5 5H4c-.156 0-.308.011-.459.028L18.5 15.5H36v-2H19L6.5 5zM3.541 30.972c.151.017.303.028.459.028h2.5L19 22.5h17v-2H18.5L3.541 30.972z"/></svg> \ No newline at end of file |