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/1f3d8.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/1f3d8.svg')
-rw-r--r-- | public/emoji/1f3d8.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3d8.svg b/public/emoji/1f3d8.svg index 805e0aa14..483f1ade5 100644 --- a/public/emoji/1f3d8.svg +++ b/public/emoji/1f3d8.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(36,4)" id="g20"><path id="path22" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0,-4 -4,-4 l -28,0 c 0,0 -4,0 -4,4 l 0,28 c 0,4 4,4 4,4 l 28,0 c 4,0 4,-4 4,-4 L 0,0 Z"/></g><g transform="translate(0,4)" id="g24"><path id="path26" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4 4,-4 4,-4 l 28,0 c 4,0 4,4 4,4 L 36,17 0,17 0,0 Z"/></g><g transform="translate(21,26)" id="g28"><path id="path30" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 7,7 14,0 14,-9 0,-9 0,0 Z"/></g><path id="path32" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 22,17 -1,0 0,9 1,0 0,-9 z"/><path id="path34" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 34,17 1,0 0,9 -1,0 0,-9 z"/><g transform="translate(35,25)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.256,0 -0.512,0.098 -0.707,0.293 L -7,6.586 -13.293,0.293 c -0.391,-0.391 -1.023,-0.391 -1.414,0 -0.391,0.391 -0.391,1.023 0,1.414 l 7,7 c 0.391,0.391 1.023,0.391 1.414,0 l 7,-7 C 1.098,1.316 1.098,0.684 0.707,0.293 0.512,0.098 0.256,0 0,0"/></g><path id="path40" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 30,17 -4,0 0,7 4,0 0,-7 z"/><path id="path42" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 25,22 -2,0 0,2 2,0 0,-2 z"/><path id="path44" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 33,22 -2,0 0,2 2,0 0,-2 z"/><path id="path46" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 25,19 -2,0 0,2 2,0 0,-2 z"/><path id="path48" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 33,19 -2,0 0,2 2,0 0,-2 z"/><g transform="translate(2,21)" id="g50"><path id="path52" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 8,8 16,0 16,-11 0,-11 0,0 Z"/></g><path id="path54" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 3,10 2,10 2,21 3,21 3,10 Z"/><path id="path56" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 17,10 1,0 0,11 -1,0 0,-11 z"/><g transform="translate(19,19)" id="g58"><path id="path60" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.256,0 -0.512,0.098 -0.707,0.293 L -9,8.586 -17.293,0.293 c -0.391,-0.391 -1.023,-0.391 -1.414,0 -0.391,0.391 -0.391,1.023 0,1.414 l 9,9 c 0.391,0.391 1.023,0.391 1.414,0 l 9,-9 C 1.098,1.316 1.098,0.684 0.707,0.293 0.512,0.098 0.256,0 0,0"/></g><path id="path62" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 12,10 -4,0 0,9 4,0 0,-9 z"/><path id="path64" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 7,16 -3,0 0,3 3,0 0,-3 z"/><path id="path66" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16,16 -3,0 0,3 3,0 0,-3 z"/><path id="path68" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 7,12 -3,0 0,3 3,0 0,-3 z"/><path id="path70" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16,12 -3,0 0,3 3,0 0,-3 z"/><g transform="translate(10,17)" id="g72"><path id="path74" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 10,10 20,0 20,-14 0,-14 0,0 Z"/></g><path id="path76" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 11,3 -1,0 0,14 1,0 0,-14 z"/><path id="path78" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 29,3 1,0 0,14 -1,0 0,-14 z"/><g transform="translate(31,15)" id="g80"><path id="path82" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.256,0 -0.512,0.098 -0.707,0.293 L -11,10.586 -21.293,0.293 c -0.391,-0.391 -1.023,-0.391 -1.414,0 -0.391,0.391 -0.391,1.023 0,1.414 l 11,11 c 0.391,0.391 1.023,0.391 1.414,0 l 11,-11 C 1.098,1.316 1.098,0.684 0.707,0.293 0.512,0.098 0.256,0 0,0"/></g><path id="path84" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 22,3 -4,0 0,6 4,0 0,-6 z"/><path id="path86" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16,11 -4,0 0,4 4,0 0,-4 z"/><path id="path88" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 28,11 -4,0 0,4 4,0 0,-4 z"/><path id="path90" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 22,11 -4,0 0,4 4,0 0,-4 z"/><path id="path92" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16,5 -4,0 0,4 4,0 0,-4 z"/><path id="path94" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 28,5 -4,0 0,4 4,0 0,-4 z"/></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M1.537 24.962c-.414 0-.75.336-.75.75 0 .415.336.75.75.75h18v-1.5h-18zm33.671-7.955h-12.5v1.5h12.5c.414 0 .75-.336.75-.75 0-.415-.335-.75-.75-.75z"/><path fill="#FFCC4D" d="M23.216 9.624l5.742-5.742 5.743 5.742v7.383H23.216z"/><path fill="#292F33" d="M34.701 10.445c-.21 0-.42-.08-.58-.24l-5.162-5.162-5.162 5.162c-.32.32-.84.32-1.16 0-.32-.32-.32-.84 0-1.16l5.742-5.742c.32-.32.84-.32 1.16 0l5.742 5.742c.32.32.32.84 0 1.16-.161.159-.371.24-.58.24z"/><path fill="#662113" d="M27.318 11.265h3.281v5.742h-3.281z"/><path fill="#3B88C3" d="M24.857 11.265h1.641v1.641h-1.641zm6.562 0h1.641v1.641h-1.641zm0 2.461h1.641v1.641h-1.641z"/><path fill="#FFCC4D" d="M10.537 5.259l-8.296 8.296v11.407h16.592V13.555z"/><path fill="#292F33" d="M19.87 15.629c-.265 0-.531-.101-.733-.304l-8.6-8.6-8.6 8.6c-.405.405-1.061.405-1.466 0s-.405-1.061 0-1.466l9.333-9.333c.405-.405 1.061-.405 1.466 0l9.333 9.333c.405.405.405 1.061 0 1.466-.202.202-.467.304-.733.304z"/><path fill="#662113" d="M8.463 15.629h4.148v9.333H8.463z"/><path fill="#3B88C3" d="M4.315 15.629h3.111v3.111H4.315zm0 4.148h3.111v3.111H4.315z"/><path fill="#FFE8B6" d="M21.477 8.438L10.954 18.995v14.519H32V18.995z"/><path fill="#66757F" d="M33 33.008H10c-.552 0-1 .449-1 1.003 0 .554.448 1.003 1 1.003h23c.552 0 1-.449 1-1.003 0-.554-.448-1.003-1-1.003z"/><path fill="#FFCC4D" d="M21 19h1v14h-1z"/><path fill="#C1694F" d="M14 27h4v6h-4z"/><path fill="#55ACEE" d="M14 20h4v4h-4zm11 0h4v4h-4zm0 7h4v4h-4z"/><path fill="#66757F" d="M21 19.603c-.256 0-.512-.098-.707-.293-.391-.391-.391-1.023 0-1.414l6.5-6.5 1.414 1.414-6.5 6.5c-.195.196-.451.293-.707.293z"/><path fill="#66757F" d="M32.884 19.603c-.265 0-.531-.101-.733-.304L21.477 8.625 10.803 19.299c-.405.405-1.061.405-1.466 0s-.405-1.061 0-1.466L20.744 6.426c.405-.405 1.061-.405 1.466 0l11.407 11.407c.405.405.405 1.061 0 1.466-.202.203-.467.304-.733.304z"/></svg> \ No newline at end of file |