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/1f404.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/1f404.svg')
-rw-r--r-- | public/emoji/1f404.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f404.svg b/public/emoji/1f404.svg index d0dca2b50..283184c14 100644 --- a/public/emoji/1f404.svg +++ b/public/emoji/1f404.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(34,21)" id="g20"><path id="path22" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,2 -2.127,4.702 -4,4 -8,-3 -19,2 -19,2 -2.209,0 -6.857,-9.257 -5,-10 0.277,-0.111 0.541,-0.227 0.799,-0.343 C -29.352,-5.087 -29.717,-6.809 -28,-7 c 9,-1 6.896,-14 8,-14 1.344,0 2.685,2.614 3.422,5 l 9.8,0 c 0.288,-2.355 0.866,-5 1.778,-5 0.866,0 2.611,3.542 3.794,9.142 C -0.472,-9.232 0,-5.326 0,0"/></g><g transform="translate(10,14)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2,0 -4.946,-0.087 -6.973,-0.087 -9,-0.087 -10.617,3.391 -9.309,4.695 -8,6 -4,7 -5,11 -5.542,13.169 -1,14 1,13 5.816,10.592 6,3 -1,3 -1,3 2,0 0,0"/></g><g transform="translate(30,25)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.586,-0.97 -5.485,-1.101 -8.226,-0.838 -9.331,-2.231 -10,-4.031 -10,-6 c 0,-4.418 3.357,-8 7.5,-8 2.587,0 4.866,1.396 6.215,3.521 C 3.896,-8.607 4,-6.462 4,-4 4,-2 1.873,0.702 0,0"/></g><g transform="translate(21,11.5)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.933 -1.567,-3.5 -3.5,-3.5 -5.433,-3.5 -7,-1.933 -7,0 -7,1.934 -5.433,3.5 -3.5,3.5 -1.567,3.5 0,1.934 0,0"/></g><g transform="translate(32,8)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2"/></g><g transform="translate(11,27)" id="g40"><path id="path42" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.552 -0.671,-1 -1.5,-1 -2.329,-1 -6,1.448 -6,2 -6,2.552 -3.77,2.308 -3,2 -0.5,1 0,0.552 0,0"/></g><g transform="translate(9,23)" id="g44"><path id="path46" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.448,-1 -1,-1 -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 0.552,0 1,-0.448 1,-1"/></g><g transform="translate(35,12)" id="g48"><path id="path50" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.447 -1,1 l 0,5 c 0,1.439 -0.561,2 -2,2 -0.553,0 -1,0.448 -1,1 0,0.552 0.447,1 1,1 2.542,0 4,-1.458 4,-4 L 1,1 C 1,0.447 0.553,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="M34 15c0-2-2.127-4.702-4-4-8 3-19-2-19-2-2.209 0-6.857 9.257-5 10 .277.111.541.227.799.343C4.648 20.087 4.283 21.809 6 22c9 1 6.896 14 8 14 1.344 0 2.685-2.614 3.422-5h9.8c.288 2.354.866 5 1.778 5 .866 0 2.611-3.542 3.794-9.142C33.528 24.232 34 20.326 34 15z"/><path fill="#292F33" d="M10 22c-2 0-4.946.087-6.973.087S-.617 18.609.692 17.305C2 16 6 15 5 11c-.542-2.169 4-3 6-2 4.816 2.408 5 10-2 10 0 0 3 3 1 3zm20-11c-2.586.97-5.485 1.101-8.226.838C20.669 13.231 20 15.031 20 17c0 4.418 3.357 8 7.5 8 2.587 0 4.866-1.396 6.215-3.521.181-1.872.285-4.017.285-6.479 0-2-2.127-4.702-4-4z"/><circle fill="#292F33" cx="17.5" cy="24.5" r="3.5"/><circle fill="#292F33" cx="30" cy="28" r="2"/><path fill="#CCD6DD" d="M11 9c0 .552-.671 1-1.5 1S5 7.552 5 7s2.23-.308 3 0c2.5 1 3 1.448 3 2z"/><circle fill="#CCD6DD" cx="8" cy="13" r="1"/><path fill="#292F33" d="M35 24c-.553 0-1-.447-1-1v-5c0-1.44-.561-2-2-2-.553 0-1-.448-1-1s.447-1 1-1c2.542 0 4 1.458 4 4v5c0 .553-.447 1-1 1z"/></svg> \ No newline at end of file |