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/1f1ea-1f1e8.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/1f1ea-1f1e8.svg')
-rw-r--r-- | public/emoji/1f1ea-1f1e8.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1ea-1f1e8.svg b/public/emoji/1f1ea-1f1e8.svg index d8af4a192..c035be7a9 100644 --- a/public/emoji/1f1ea-1f1e8.svg +++ b/public/emoji/1f1ea-1f1e8.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,9)" id="g20"><path id="path22" style="fill:#ed1c23;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 0,18 c 0,2.209 1.791,4 4,4 l 28,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><path id="path24" style="fill:#034ea2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,12 -36,0 0,7 36,0 0,-7 z"/><g transform="translate(36,19)" id="g26"><path id="path28" style="fill:#ffdd00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,8 c 0,2.209 -1.791,4 -4,4 l -28,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-8 36,0 z"/></g><g transform="translate(23,17)" id="g30"><path id="path32" style="fill:#ffdd00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -6,0 c -1.104,0 -2,0.896 -2,2 l 0,3 c 0,1.105 0.896,2 2,2 l 6,0 C -0.895,5 0,4.105 0,3 L 0,0 Z"/></g><g transform="translate(22,18)" id="g34"><path id="path36" style="fill:#034ea2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-3 -2,-3 l -4,0 c -1.104,0 -2,1.896 -2,3 l 0,1 c 0,1.105 0.896,2 2,2 l 4,0 C -0.895,3 0,2.105 0,1 L 0,0 Z"/></g><g transform="translate(21,18)" id="g38"><path id="path40" style="fill:#ed1c23;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-3 -2,-3 l -2,0 c -1.104,0 -2,1.896 -2,3 l 0,1 c 0,1.105 0.896,2 2,2 l 2,0 C -0.895,3 0,2.105 0,1 L 0,0 Z"/></g><g transform="translate(19.9727,21.8652)" id="g42"><path id="path44" style="fill:#6dbe46;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.133,-0.488 -0.961,-0.865 -1.973,-0.865 -1.012,0 -1.84,0.377 -1.972,0.865 -1.206,-0.172 -1.028,-0.493 -1.028,-0.865 0,-0.552 0.791,-1 3,-1 2.209,0 3,0.448 3,1 C 1.027,-0.493 1.205,-0.172 0,0"/></g><g transform="translate(19,17)" id="g46"><path id="path48" style="fill:#a6d388;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.448,-1 -1,-1 -0.552,0 -1,0.447 -1,1 l 0,3 c 0,0.552 0.448,1 1,1 0.552,0 1,-0.448 1,-1 L 0,0 Z"/></g><g transform="translate(21.5,24)" id="g50"><path id="path52" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.44,0 0.858,-0.052 1.246,-0.137 0.623,0.939 -1.5,2 -3.5,0 -5.5,2 -7.623,0.939 -8.246,-0.137 -7.858,-0.052 -7.44,0 -7,0 c 1.933,0 3.5,-0.895 3.5,-2 0,1.105 1.566,2 3.5,2"/></g><g transform="translate(20,18.5)" id="g54"><path id="path56" style="fill:#8ed2e7;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.933 -0.895,-3.5 -2,-3.5 -1.104,0 -2,1.567 -2,3.5 0,1.933 0.896,3.5 2,3.5 1.105,0 2,-1.567 2,-3.5"/></g><g transform="translate(17.5,19)" id="g58"><path id="path60" style="fill:#6dbe46;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.536,0 -1.037,-0.13 -1.491,-0.345 -1.492,-0.397 -1.5,-0.447 -1.5,-0.5 c 0,-1.933 0.896,-3.5 2,-3.5 1.003,0 1.825,1.295 1.97,2.979 C 1.837,-0.391 0.964,0 0,0"/></g><g transform="translate(21,14)" id="g62"><path id="path64" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -1.343,-1 -3,-1 -1.657,0 -3,0.447 -3,1 0,0.553 1.343,1 3,1 1.657,0 3,-0.447 3,-1"/></g><g transform="translate(20,13)" id="g66"><path id="path68" style="fill:#034ea2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.828 -0.895,-1 -2,-1 -1.104,0 -2,0.172 -2,1 0,0.828 0.896,2 2,2 1.105,0 2,-1.172 2,-2"/></g><g transform="translate(17,13)" id="g70"><path id="path72" style="fill:#ed1c23;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.828 0.448,2 1,2 1.552,2 2,0.828 2,0 2,-0.828 1.552,-1 1,-1 0.448,-1 0,-0.828 0,0"/></g><g transform="translate(17,25)" id="g74"><path id="path76" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.552 0.448,0 1,0 1.552,0 2,0.552 2,0 2,-0.552 1.552,-1 1,-1 0.448,-1 0,-0.552 0,0"/></g><g transform="translate(19,18.5)" id="g78"><path id="path80" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.276 -0.448,-0.5 -1,-0.5 -0.552,0 -1,0.224 -1,0.5 0,0.276 0.448,0.5 1,0.5 0.552,0 1,-0.224 1,-0.5"/></g><g transform="translate(14,20.5)" id="g82"><path id="path84" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.276 -0.448,-0.5 -1,-0.5 -0.552,0 -1,0.224 -1,0.5 0,0.276 0.448,0.5 1,0.5 0.552,0 1,-0.224 1,-0.5"/></g><g transform="translate(15,22.5)" id="g86"><path id="path88" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.276 -0.448,-0.5 -1,-0.5 -0.552,0 -1,0.224 -1,0.5 0,0.276 0.448,0.5 1,0.5 0.552,0 1,-0.224 1,-0.5"/></g><g transform="translate(24,20.5)" id="g90"><path id="path92" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.276 -0.447,-0.5 -1,-0.5 -0.553,0 -1,0.224 -1,0.5 0,0.276 0.447,0.5 1,0.5 0.553,0 1,-0.224 1,-0.5"/></g><g transform="translate(23,22.5)" id="g94"><path id="path96" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.276 -0.447,-0.5 -1,-0.5 -0.553,0 -1,0.224 -1,0.5 0,0.276 0.447,0.5 1,0.5 0.553,0 1,-0.224 1,-0.5"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#ED1C23" d="M36 27c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V9c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v18z"/><path fill="#034EA2" d="M0 17h36v7H0z"/><path fill="#FD0" d="M36 17V9c0-2.209-1.791-4-4-4H4C1.791 5 0 6.791 0 9v8h36z"/><path fill="#FD0" d="M23 19c0 1.104-.896 2-2 2h-6c-1.104 0-2-.896-2-2v-3c0-1.104.896-2 2-2h6c1.104 0 2 .896 2 2v3z"/><path fill="#034EA2" d="M22 18c0 1.104-.896 3-2 3h-4c-1.104 0-2-1.896-2-3v-1c0-1.104.896-2 2-2h4c1.104 0 2 .896 2 2v1z"/><path fill="#ED1C23" d="M21 18c0 1.104-.896 3-2 3h-2c-1.104 0-2-1.896-2-3v-1c0-1.104.896-2 2-2h2c1.104 0 2 .896 2 2v1z"/><path fill="#6DBE46" d="M19.973 14.135c-.133.488-.961.865-1.973.865s-1.84-.377-1.973-.865C14.822 14.307 15 14.628 15 15c0 .552.791 1 3 1s3-.448 3-1c0-.372.178-.693-1.027-.865z"/><path fill="#A6D388" d="M19 19c0 .553-.448 1-1 1s-1-.447-1-1v-3c0-.552.448-1 1-1s1 .448 1 1v3z"/><path fill="#662113" d="M21.5 12c.44 0 .858.052 1.246.137C22.123 11.061 20 10 18 12c-2-2-4.123-.939-4.746.137.388-.085.806-.137 1.246-.137 1.933 0 3.5.896 3.5 2 0-1.104 1.566-2 3.5-2z"/><ellipse fill="#8ED2E7" cx="18" cy="17.5" rx="2" ry="3.5"/><path fill="#6DBE46" d="M17.5 17c-.536 0-1.037.13-1.491.345-.001.052-.009.102-.009.155 0 1.933.896 3.5 2 3.5 1.003 0 1.825-1.295 1.97-2.979-.633-.63-1.506-1.021-2.47-1.021z"/><ellipse fill="#FFCC4D" cx="18" cy="22" rx="3" ry="1"/><path fill="#034EA2" d="M20 23c0 .828-.896 1-2 1s-2-.172-2-1 .896-2 2-2 2 1.172 2 2z"/><path fill="#ED1C23" d="M17 23c0-.828.448-2 1-2s1 1.172 1 2-.448 1-1 1-1-.172-1-1z"/><path fill="#CCD6DD" d="M17 11c0-.552.448 0 1 0s1-.552 1 0-.448 1-1 1-1-.448-1-1z"/><ellipse fill="#FFF" cx="18" cy="17.5" rx="1" ry=".5"/><ellipse fill="#C1694F" cx="13" cy="15.5" rx="1" ry=".5"/><ellipse fill="#C1694F" cx="14" cy="13.5" rx="1" ry=".5"/><ellipse fill="#C1694F" cx="23" cy="15.5" rx="1" ry=".5"/><ellipse fill="#C1694F" cx="22" cy="13.5" rx="1" ry=".5"/></svg> \ No newline at end of file |