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/1f38d.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/1f38d.svg')
-rw-r--r-- | public/emoji/1f38d.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f38d.svg b/public/emoji/1f38d.svg index f3bc7cfe4..a774540b4 100644 --- a/public/emoji/1f38d.svg +++ b/public/emoji/1f38d.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,5.4707)" id="g20"><path id="path22" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-2.469 -2.031,-4.471 -4.5,-4.471 -6.969,-4.471 -9,-2.469 -9,0 l 0,11.941 c 0,2.469 2.031,5.588 4.5,5.588 2.469,0 4.5,-3.119 4.5,-5.588 L 0,0 Z"/></g><g transform="translate(21.4561,30.4116)" id="g24"><path id="path26" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.198 -1.337,-3.98 -2.985,-3.98 -1.649,0 -2.986,1.782 -2.986,3.98 0,2.198 1.337,3.98 2.986,3.98 C -1.337,3.98 0,2.198 0,0"/></g><g transform="translate(23,5.4707)" id="g28"><path id="path30" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-2.469 -2.031,-4.471 -4.5,-4.471 -6.969,-4.471 -9,-2.469 -9,0 l 0,24.941 c 0,2.469 2.031,5.588 4.5,5.588 2.469,0 4.5,-3.119 4.5,-5.588 L 0,0 Z"/></g><g transform="translate(21.4561,30.4116)" id="g32"><path id="path34" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.198 -1.337,-3.98 -2.985,-3.98 -1.649,0 -2.986,1.782 -2.986,3.98 0,2.198 1.337,3.98 2.986,3.98 C -1.337,3.98 0,2.198 0,0"/></g><g transform="translate(30.4561,17.4116)" id="g36"><path id="path38" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.199 -1.337,-3.98 -2.985,-3.98 -1.649,0 -2.986,1.781 -2.986,3.98 0,2.198 1.337,3.98 2.986,3.98 C -1.337,3.98 0,2.198 0,0"/></g><g transform="translate(14,5.4707)" id="g40"><path id="path42" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-2.469 -2.031,-4.471 -4.5,-4.471 -6.969,-4.471 -9,-2.469 -9,0 l 0,18.941 c 0,2.469 2.031,5.588 4.5,5.588 2.469,0 4.5,-3.119 4.5,-5.588 L 0,0 Z"/></g><g transform="translate(12.4561,24.4116)" id="g44"><path id="path46" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.198 -1.337,-3.98 -2.985,-3.98 -1.649,0 -2.986,1.782 -2.986,3.98 0,2.198 1.337,3.98 2.986,3.98 C -1.337,3.98 0,2.198 0,0"/></g><g transform="translate(24,14)" id="g48"><path id="path50" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -9,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 l 9,0 C -0.447,1 0,0.553 0,0"/></g><g transform="translate(24,22)" id="g52"><path id="path54" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 l -9,0 c -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 l 9,0 C -0.447,1 0,0.552 0,0"/></g><g transform="translate(15,18)" id="g56"><path id="path58" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -9,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 l 9,0 C -0.447,1 0,0.553 0,0"/></g><g transform="translate(35,3.5)" id="g60"><path id="path62" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.381 -1.119,-2.5 -2.5,-2.5 l -28,0 c -1.381,0 -2.5,1.119 -2.5,2.5 0,1.381 1.119,2.5 2.5,2.5 l 28,0 C -1.119,2.5 0,1.381 0,0"/></g><g transform="translate(31,9)" id="g64"><path id="path66" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -1.229,0.565 -3.272,1.176 -0.645,-1.426 -1.299,-2.785 -1.561,-3.426 -0.519,-1.27 -1.125,-0.875 -0.925,0.169 0.102,0.532 0.461,2.616 0.737,3.729 -1.987,0.487 -4.45,0.909 -7.162,0.996 -0.15,-1.727 -0.402,-3.219 -0.484,-4.144 -0.125,-1.417 -1.5,-1.333 -1.625,-0.042 -0.067,0.702 -0.163,2.683 -0.26,4.171 -2.026,-0.092 -4.149,-0.399 -6.292,-1.016 0.091,-1.013 0.304,-2.884 0.386,-3.53 0.185,-1.469 -0.554,-1.086 -0.834,-0.291 -0.178,0.507 -0.819,2.217 -1.266,3.259 C -23.374,0.75 -24.189,0.405 -25,0 c -2,-1 -4,-3 -4,-4 l 0,-1 4,0 25,0 4,0 0,1 c 0,1 -2,3 -4,4"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#77B255" d="M32 30.529C32 32.998 29.969 35 27.5 35S23 32.998 23 30.529V18.588C23 16.119 25.031 13 27.5 13s4.5 3.119 4.5 5.588v11.941z"/><path fill="#FFE8B6" d="M21.456 5.588c0 2.198-1.337 3.98-2.985 3.98s-2.985-1.782-2.985-3.98 1.337-3.98 2.985-3.98 2.985 1.782 2.985 3.98z"/><path fill="#77B255" d="M23 30.529C23 32.998 20.969 35 18.5 35S14 32.998 14 30.529V5.588C14 3.119 16.031 0 18.5 0S23 3.119 23 5.588v24.941z"/><path fill="#FFE8B6" d="M21.456 5.588c0 2.198-1.337 3.98-2.985 3.98s-2.985-1.782-2.985-3.98 1.337-3.98 2.985-3.98 2.985 1.782 2.985 3.98zm9 13c0 2.199-1.337 3.98-2.985 3.98s-2.985-1.781-2.985-3.98c0-2.198 1.337-3.981 2.985-3.981 1.648.001 2.985 1.783 2.985 3.981z"/><path fill="#77B255" d="M14 30.529C14 32.998 11.969 35 9.5 35S5 32.998 5 30.529V11.588C5 9.119 7.031 6 9.5 6S14 9.119 14 11.588v18.941z"/><path fill="#FFE8B6" d="M12.456 11.588c0 2.198-1.337 3.98-2.985 3.98s-2.985-1.782-2.985-3.98 1.337-3.98 2.985-3.98 2.985 1.782 2.985 3.98z"/><path fill="#5C913B" d="M24 22c0 .553-.447 1-1 1h-9c-.552 0-1-.447-1-1 0-.553.448-1 1-1h9c.553 0 1 .447 1 1zm0-8c0 .552-.447 1-1 1h-9c-.552 0-1-.448-1-1s.448-1 1-1h9c.553 0 1 .448 1 1zm-9 4c0 .553-.447 1-1 1H5c-.552 0-1-.447-1-1 0-.553.448-1 1-1h9c.553 0 1 .447 1 1z"/><path fill="#D99E82" d="M35 32.5c0 1.381-1.119 2.5-2.5 2.5h-28C3.119 35 2 33.881 2 32.5S3.119 30 4.5 30h28c1.381 0 2.5 1.119 2.5 2.5z"/><path fill="#5C913B" d="M31 27s-1.229-.565-3.272-1.176c-.645 1.426-1.299 2.785-1.561 3.426-.52 1.27-1.125.875-.925-.169.102-.532.461-2.616.736-3.729-1.986-.486-4.449-.908-7.162-.995-.15 1.727-.402 3.219-.483 4.144-.125 1.417-1.5 1.333-1.625.042-.068-.702-.164-2.683-.26-4.171-2.026.092-4.149.398-6.292 1.016.091 1.014.304 2.885.386 3.53.186 1.469-.553 1.086-.833.291-.178-.507-.82-2.217-1.267-3.259-.816.3-1.631.645-2.442 1.05-2 1-4 3-4 4v1h33v-1c0-1-2-3-4-4z"/></svg> \ No newline at end of file |