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/1f516.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/1f516.svg')
-rw-r--r-- | public/emoji/1f516.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f516.svg b/public/emoji/1f516.svg index a8baaeb5c..38dc790ab 100644 --- a/public/emoji/1f516.svg +++ b/public/emoji/1f516.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(35,10)" id="g20"><path id="path22" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -26,0 c -2.209,0 -4,1.791 -4,4 l 0,19.687 c 0,2.209 5.791,6.313 8,6.313 l 20.625,0 C -2.281,26 0,23.687 0,20.625 L 0,0 Z"/></g><g transform="translate(33,6)" id="g24"><path id="path26" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -22,0 c -2.209,0 -4,1.791 -4,4 l 0,24 c 0,4.119 -0.021,4 5,4 l 21,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(31,5)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.343,-3 -3,-3 l -24,0 c -1.657,0 -3,1.343 -3,3 l 0,24 c 0,1.657 1.343,3 3,3 l 24,0 c 1.657,0 3,-1.343 3,-3 L 0,0 Z"/></g><g transform="translate(31,4)" id="g32"><path id="path34" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -21,0 c -2.209,0 -4,1.791 -4,4 l 0,22 c 0,2.209 1.791,4 4,4 l 21,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(29,4)" id="g36"><path id="path38" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -19,0 c -2.209,0 -4,1.791 -4,4 l 0,20 c 0,2.209 1.791,4 4,4 l 19.335,0 C -1.456,24 0,22.544 0,20.335 L 0,0 Z"/></g><g transform="translate(6,30)" id="g40"><path id="path42" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.687,0 -1.731,1.922 -1,2.75 -0.168,3.691 1.125,4 3.438,4 L 5,4 5,6 2.281,6 C -1.687,6 -5,3.5 -5,0.625 L -5,-26 c 0,-2.209 1.791,-4 4,-4 l 2,0 0,30 -1,0 z"/></g><g transform="translate(17,32)" id="g44"><path id="path46" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-23 4,6 4,-6 0,23 -8,0 z"/></g><g transform="translate(17,32)" id="g48"><path id="path50" style="fill:none;stroke:#dd2e44;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" d="m 0,0 0,-23 4,6 4,-6 0,23 -8,0 z"/></g><path id="path52" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 27,32 -12,0 0,2 12,0 0,-2 z"/></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#AAB8C2" d="M35 26c0 2.209-1.791 4-4 4H5c-2.209 0-4-1.791-4-4V6.313C1 4.104 6.791 0 9 0h20.625C32.719 0 35 2.312 35 5.375V26z"/><path fill="#F5F8FA" d="M33 30c0 2.209-1.791 4-4 4H7c-2.209 0-4-1.791-4-4V6c0-4.119-.021-4 5-4h21c2.209 0 4 1.791 4 4v24z"/><path fill="#FFF" d="M31 31c0 1.657-1.343 3-3 3H4c-1.657 0-3-1.343-3-3V7c0-1.657 1.343-3 3-3h24c1.657 0 3 1.343 3 3v24z"/><path fill="#AAB8C2" d="M31 32c0 2.209-1.791 4-4 4H6c-2.209 0-4-1.791-4-4V10c0-2.209 1.791-4 4-4h21c2.209 0 4 1.791 4 4v22z"/><path fill="#E1E8ED" d="M29 32c0 2.209-1.791 4-4 4H6c-2.209 0-4-1.791-4-4V12c0-2.209 1.791-4 4-4h19.335C27.544 8 29 9.456 29 11.665V32z"/><path fill="#AAB8C2" d="M6 6C4.312 6 4.269 4.078 5 3.25 5.832 2.309 7.125 2 9.438 2H11V0H8.281C4.312 0 1 2.5 1 5.375V32c0 2.209 1.791 4 4 4h2V6H6z"/><g fill="#DD2E44"><path d="M17 4v23l4-6 4 6V4z"/><path d="M25 28c-.328 0-.644-.162-.832-.445L21 22.803l-3.168 4.752c-.245.367-.701.531-1.122.402-.421-.128-.71-.517-.71-.957V4c0-.552.448-1 1-1h8c.553 0 1 .448 1 1v23c0 .44-.288.829-.71.957-.096.029-.193.043-.29.043zm-4-8c.334 0 .646.167.832.445L24 23.697V5h-6v18.697l2.168-3.252c.186-.278.498-.445.832-.445z"/></g><path fill="#F5F8FA" d="M15 2h12v2H15z"/></svg> \ No newline at end of file |