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/1f3e6.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/1f3e6.svg')
-rw-r--r-- | public/emoji/1f3e6.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3e6.svg b/public/emoji/1f3e6.svg index 99f5f1ff0..2fd3fb077 100644 --- a/public/emoji/1f3e6.svg +++ b/public/emoji/1f3e6.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="clipPath18" clipPathUnits="userSpaceOnUse"><path id="path20" 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"><path id="path12" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 33,20 3,20 3,2 33,2 33,20 Z"/><g id="g14"><g clip-path="url(#clipPath18)" id="g16"><g transform="translate(2,2)" id="g22"><path id="path24" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 32,0 c 1.105,0 2,-0.895 2,-2 l -36,0 c 0,1.105 0.896,2 2,2"/></g><g transform="translate(18,13)" id="g26"><path id="path28" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.657,0 -3,-1.343 -3,-3 l 0,-6 6,0 0,6 C 3,-1.343 1.657,0 0,0"/></g><path id="path30" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 7,15 3,15 3,4 7,4 7,15 Z"/><path id="path32" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 13,15 9,15 9,4 13,4 13,15 Z"/><path id="path34" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 33,15 -4,0 0,-11 4,0 0,11 z"/><path id="path36" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 27,15 -4,0 0,-11 4,0 0,11 z"/><path id="path38" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 34,2 2,2 2,4 34,4 34,2 Z"/><g transform="translate(36,25)" id="g40"><path id="path42" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -18,11 -36,0 0,0 Z"/></g><g transform="translate(18,33.5996)" id="g44"><path id="path46" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -16,-9.6 0,-4 32,0 0,4 L 0,0 Z"/></g><path id="path48" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 7,15 -4,0 0,2 4,0 0,-2 z"/><path id="path50" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 13,15 -4,0 0,2 4,0 0,-2 z"/><path id="path52" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 27,15 -4,0 0,2 4,0 0,-2 z"/><path id="path54" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 33,15 -4,0 0,2 4,0 0,-2 z"/><path id="path56" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 35,19 -34,0 0,5 34,0 0,-5 z"/><g transform="translate(36,24)" id="g58"><path id="path60" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 l -34,0 c -0.552,0 -1,0.448 -1,1 l 0,1 c 0,0.552 0.448,1 1,1 L -1,2 C -0.447,2 0,1.552 0,1 L 0,0 Z"/></g><g transform="translate(36,18)" id="g62"><path id="path64" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 l -34,0 c -0.552,0 -1,0.448 -1,1 l 0,1 c 0,0.552 0.448,1 1,1 L -1,2 C -0.447,2 0,1.552 0,1 L 0,0 Z"/></g><path id="path66" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 23,2 13,2 13,4 23,4 23,2 Z"/><path id="path68" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 25,0 11,0 11,2 25,2 25,0 Z"/></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#66757F" d="M3 16h30v18H3z"/><path fill="#CCD6DD" d="M2 34h32c1.104 0 2 .896 2 2H0c0-1.104.896-2 2-2z"/><path fill="#292F33" d="M18 23c-1.657 0-3 1.343-3 3v6h6v-6c0-1.657-1.343-3-3-3z"/><path fill="#CCD6DD" d="M3 21h4v11H3zm6 0h4v11H9zm20 0h4v11h-4zm-6 0h4v11h-4z"/><path fill="#AAB8C2" d="M2 32h32v2H2z"/><path fill="#66757F" d="M36 11L18 0 0 11z"/><path fill="#CCD6DD" d="M18 2.4L2 12v4h32v-4z"/><path fill="#8899A6" d="M3 19h4v2H3zm6 0h4v2H9zm14 0h4v2h-4zm6 0h4v2h-4z"/><path fill="#CCD6DD" d="M1 12h34v5H1z"/><path fill="#AAB8C2" d="M36 12c0 .552-.447 1-1 1H1c-.552 0-1-.448-1-1v-1c0-.552.448-1 1-1h34c.553 0 1 .448 1 1v1zm0 6c0 .552-.447 1-1 1H1c-.552 0-1-.448-1-1v-1c0-.552.448-1 1-1h34c.553 0 1 .448 1 1v1z"/><path fill="#E1E8ED" d="M13 32h10v2H13z"/><path fill="#F5F8FA" d="M11 34h14v2H11z"/></svg> \ No newline at end of file |