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/1f433.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/1f433.svg')
-rw-r--r-- | public/emoji/1f433.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f433.svg b/public/emoji/1f433.svg index 6085b4793..c3c6668b0 100644 --- a/public/emoji/1f433.svg +++ b/public/emoji/1f433.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(32,24)" id="g20"><path id="path22" style="fill:#744eaa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2.122,2.122 5,-14.313 -3,-21 -2.757,-2.305 -6,-2.969 -8,-2.969 -2.371,0 -10.029,-0.031 -13,-0.031 -7.18,0 -8,4.925 -8,11 0,6.075 0.82,11 8,11 6,0 10,-2 13,-3.996 4.977,-3.312 5.992,-3.861 8,-2.004 3.213,2.97 1,6 3,8"/></g><g transform="translate(34.0029,13)" id="g24"><path id="path26" style="fill:#aa8dd8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.465,-3.727 -2.041,-7.523 -5.003,-10 -2.757,-2.305 -6,-2.969 -8,-2.969 -2.371,0 -10.029,-0.031 -13,-0.031 -4.035,0 -6.061,1.555 -7.062,3.996 -0.781,1.902 3.062,-0.996 14.062,-0.996 14,0 17,5 19.003,10"/></g><g transform="translate(32,22)" id="g28"><path id="path30" style="fill:#744eaa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 4.123,0 4,5 4,7 4,9 2,6 -1,5 -4,4 -8,7 -7,5 -6,3 -4,0 0,0"/></g><g transform="translate(10,29)" id="g32"><path id="path34" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -0.895,-6 -2,-6 -1.104,0 -2,3.791 -2,6 0,2.209 0.896,2 2,2 1.105,0 2,0.209 2,-2"/></g><g transform="translate(8,31)" id="g36"><path id="path38" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,3 -6,2 -6,0 0,-2 3,-1 4,-3 1,-2 2,3 2,3"/></g><g transform="translate(8,31)" id="g40"><path id="path42" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,3 6,2 6,0 6,-2 3,-1 2,-3 1,-5 0,0 0,0"/></g><g transform="translate(8,10.5)" id="g44"><path id="path46" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.828 -0.671,-1.5 -1.5,-1.5 -2.329,-1.5 -3,-0.828 -3,0 -3,0.828 -2.329,1.5 -1.5,1.5 -0.671,1.5 0,0.828 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#744EAA" d="M32 12c2.122-2.122 5 14.312-3 21-2.757 2.305-6 2.969-8 2.969-2.371 0-10.029.031-13 .031-7.18 0-8-4.925-8-11s.82-11 8-11c6 0 10 2 13 3.996 4.977 3.312 5.992 3.861 8 2.004 3.213-2.97 1-6 3-8z"/><path fill="#AA8DD8" d="M34.003 23c-.465 3.727-2.041 7.523-5.003 10-2.757 2.305-6 2.969-8 2.969-2.371 0-10.029.031-13 .031-4.035 0-6.062-1.555-7.062-3.996C.157 30.102 4 33 15 33c14 0 17-5 19.003-10z"/><path fill="#744EAA" d="M32 14c4.123 0 4-5 4-7s-2 1-5 2-7-2-6 0 3 5 7 5z"/><path fill="#55ACEE" d="M10 7c0 2.209-.896 6-2 6S6 9.209 6 7s.896-2 2-2 2-.209 2 2z"/><path fill="#55ACEE" d="M8 5c0-3-6-2-6 0s3 1 4 3 2-3 2-3zm0 0c0-3 6-2 6 0s-3 1-4 3-2-3-2-3z"/><circle fill="#292F33" cx="6.5" cy="25.5" r="1.5"/></svg> \ No newline at end of file |