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/1f3e5.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/1f3e5.svg')
-rw-r--r-- | public/emoji/1f3e5.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3e5.svg b/public/emoji/1f3e5.svg index f115d2de4..0b2748a52 100644 --- a/public/emoji/1f3e5.svg +++ b/public/emoji/1f3e5.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(24,26)" id="g20"><path id="path22" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -8,0 c -1.104,0 -2,0.896 -2,2 l 0,8 c 0,1.104 0.896,2 2,2 l 8,0 C -0.895,10 0,9.104 0,8 L 0,0 Z"/></g><g transform="translate(0,22)" id="g24"><path id="path26" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-20 c 0,-1.105 0.896,-2 2,-2 l 32,0 c 1.105,0 2,0.895 2,2 L 36,0 0,0 Z"/></g><g transform="translate(18,24)" id="g28"><path id="path30" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -16,0 c -1.104,0 -2,-0.895 -2,-2 L 2,-2 C 2,-0.895 1.105,0 0,0"/></g><g transform="translate(34,24)" id="g32"><path id="path34" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -16,0 c -1.104,0 -2,-0.895 -2,-2 L 2,-2 C 2,-0.895 1.105,0 0,0"/></g><path id="path36" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 34,10 -32,0 0,4 32,0 0,-4 z"/><path id="path38" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 34,16 -32,0 0,4 32,0 0,-4 z"/><path id="path40" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 34,4 2,4 2,8 34,8 34,4 Z"/><path id="path42" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 28,0 8,0 8,24 28,24 28,0 Z"/><path id="path44" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26,12 -16,0 0,4 16,0 0,-4 z"/><path id="path46" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26,18 -16,0 0,4 16,0 0,-4 z"/><path id="path48" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26,6 -16,0 0,4 16,0 0,-4 z"/><path id="path50" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 23,0 13,0 13,4 23,4 23,0 Z"/><g transform="translate(22,32)" id="g52"><path id="path54" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 0,3 -2,0 0,-3 -3,0 0,-2 3,0 0,-3 2,0 0,3 3,0 0,2 z"/></g><g transform="translate(26,26)" id="g56"><path id="path58" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -16,0 c -1.104,0 -2,-0.895 -2,-2 L 2,-2 C 2,-0.895 1.105,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M24 10c0 1.104-.896 2-2 2h-8c-1.104 0-2-.896-2-2V2c0-1.104.896-2 2-2h8c1.104 0 2 .896 2 2v8zM0 14v20c0 1.104.896 2 2 2h32c1.104 0 2-.896 2-2V14H0z"/><path fill="#99AAB5" d="M18 12H2c-1.104 0-2 .896-2 2h20c0-1.104-.896-2-2-2z"/><path fill="#99AAB5" d="M34 12H18c-1.104 0-2 .896-2 2h20c0-1.104-.896-2-2-2z"/><path fill="#55ACEE" d="M2 22h32v4H2zm0-6h32v4H2zm0 12h32v4H2z"/><path fill="#E1E8ED" d="M8 12h20v24H8z"/><path fill="#55ACEE" d="M10 20h16v4H10zm0-6h16v4H10zm0 12h16v4H10z"/><path fill="#3B88C3" d="M13 32h10v4H13z"/><path fill="#DD2E44" d="M22 4h-3V1h-2v3h-3v2h3v3h2V6h3z"/><path fill="#99AAB5" d="M26 10H10c-1.104 0-2 .896-2 2h20c0-1.104-.896-2-2-2z"/></svg> \ No newline at end of file |