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/1f1fa-1f1fe.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/1f1fa-1f1fe.svg')
-rw-r--r-- | public/emoji/1f1fa-1f1fe.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1fa-1f1fe.svg b/public/emoji/1f1fa-1f1fe.svg index dfd2535a0..796244c9d 100644 --- a/public/emoji/1f1fa-1f1fe.svg +++ b/public/emoji/1f1fa-1f1fe.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,9)" id="g20"><path id="path22" style="fill:#0038a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 1.791,-4 4,-4 l 28,0 c 2.209,0 4,1.791 4,4 L 36,1 0,1 0,0 Z"/></g><path id="path24" style="fill:#0038a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,13 36,0 0,4 -36,0 0,-4 z"/><path id="path26" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,10 36,0 0,3 -36,0 0,-3 z"/><g transform="translate(36,27)" id="g28"><path id="path30" style="fill:#0038a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,2.209 -1.791,4 -4,4 L -20,4 -20,0 0,0 Z"/></g><path id="path32" style="fill:#0038a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16,20 20,0 0,4 -20,0 0,-4 z"/><g transform="translate(16,27)" id="g34"><path id="path36" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,4 -0.5,4 -12,4 c -2.209,0 -4,-1.791 -4,-4 l 0,-9.25 0,-0.75 16,0 20,0 0,3 -20,0 0,4 20,0 0,3 -20,0 z"/></g><g transform="translate(13,24)" id="g38"><path id="path40" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,2.762 -2.238,5 -5,5 -2.762,0 -5.001,-2.238 -5.001,-5 0,-2.761 2.239,-5 5.001,-5 2.762,0 5,2.239 5,5"/></g><g transform="translate(12,24)" id="g42"><path id="path44" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,2.209 -1.79,4 -4,4 -2.21,0 -4.001,-1.791 -4.001,-4 0,-2.208 1.791,-4 4.001,-4 2.21,0 4,1.792 4,4"/></g><g transform="translate(8,30.4033)" id="g46"><path id="path48" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.633,-4.041 3.202,-0.858 1.729,-4.674 5.545,-3.202 2.362,-5.771 6.403,-6.403 2.362,-7.036 5.545,-9.605 1.729,-8.133 3.202,-11.949 0.633,-8.766 0,-12.807 l -0.633,4.041 -2.569,-3.183 1.473,3.816 -3.816,-1.472 3.183,2.569 -4.041,0.633 4.041,0.632 -3.183,2.569 3.816,-1.472 -1.473,3.816 2.569,-3.183 L 0,0 Z"/></g><g transform="translate(11,24)" id="g50"><path id="path52" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.657 -1.343,3 -3,3 -1.658,0 -3.001,-1.343 -3.001,-3 0,-1.656 1.343,-3 3.001,-3 1.657,0 3,1.344 3,3"/></g><g transform="translate(5.834,23.9961)" id="g54"><path id="path56" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.19 0.964,2.154 2.153,2.154 3.343,2.154 4.307,1.19 4.307,0 4.307,-1.188 3.343,-2.152 2.153,-2.152 0.964,-2.152 0,-1.188 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#0038A8" d="M0 27c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4v-1H0v1zm0-8h36v4H0z"/><path fill="#EEE" d="M0 23h36v3H0z"/><path fill="#0038A8" d="M36 9c0-2.209-1.791-4-4-4H16v4h20zm-20 3h20v4H16z"/><path fill="#EEE" d="M16 9V5H4C1.791 5 0 6.791 0 9v10h36v-3H16v-4h20V9H16z"/><path fill="#FFD983" d="M13 12c0-2.762-2.238-5-5-5s-5 2.239-5 5 2.239 5 5 5c2.762 0 5-2.239 5-5z"/><path fill="#FFCC4D" d="M12 12c0-2.209-1.79-4-4-4-2.209 0-4 1.791-4 4 0 2.208 1.791 4 4 4 2.21 0 4-1.792 4-4z"/><path fill="#FFAC33" d="M8 5.597l.633 4.041 2.569-3.183-1.473 3.816 3.816-1.473-3.183 2.569 4.041.633-4.041.633 3.183 2.569-3.816-1.473 1.473 3.816-2.569-3.183L8 18.403l-.633-4.041-2.569 3.183 1.473-3.816-3.816 1.473 3.183-2.569L1.597 12l4.041-.633-3.183-2.569 3.816 1.473-1.473-3.816 2.569 3.183z"/><path fill="#C1694F" d="M11 12c0-1.657-1.343-3-3-3s-3 1.343-3 3c0 1.656 1.343 3 3 3s3-1.344 3-3z"/><path fill="#FFAC33" d="M5.834 12.004c0-1.19.964-2.154 2.153-2.154s2.153.964 2.153 2.154c0 1.189-.964 2.152-2.153 2.152s-2.153-.964-2.153-2.152z"/></svg> \ No newline at end of file |