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/1f42e.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/1f42e.svg')
-rw-r--r-- | public/emoji/1f42e.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f42e.svg b/public/emoji/1f42e.svg index a3d5d0305..40fede032 100644 --- a/public/emoji/1f42e.svg +++ b/public/emoji/1f42e.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(4,28)" id="g20"><path id="path22" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -4,-2 -4,-11 0,0 6,1 7,3 0,0 2,12.25 -3,8"/></g><g transform="translate(31.9951,27.9565)" id="g24"><path id="path26" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 4,-2 4,-11 0,0 -6,1 -7,3 0,0 -2,12.25 3,8"/></g><g transform="translate(1,35)" id="g28"><path id="path30" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.01,-0.99 1,-8 5,-9 4,-1 4,5 3,5 -4,0 -5.958,6 -8,4"/></g><g transform="translate(35.2969,35)" id="g32"><path id="path34" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.011,-0.99 -1,-8 -5,-9 -4,-1 -4,5 -3,5 4,0 5.959,6 8,4"/></g><g transform="translate(21.9756,5)" id="g36"><path id="path38" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -7.951,0 c -5.536,0 -10.025,4.488 -10.025,10.024 l 0,8.951 c 0,5.537 4.489,10.025 10.025,10.025 L 0,29 c 5.536,0 10.024,-4.488 10.024,-10.025 l 0,-8.951 C 10.024,4.488 5.536,0 0,0"/></g><g transform="translate(35,8)" id="g40"><path id="path42" style="fill:#e6aaaa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-5.523 -4.477,-8 -10,-8 l -14,0 c -5.523,0 -10,2.477 -10,8 0,5.523 4.477,10 10,10 l 14,0 C -4.477,10 0,5.523 0,0"/></g><g transform="translate(11,10)" id="g44"><path id="path46" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.657 -0.671,-3 -1.5,-3 -2.329,-3 -3,-1.657 -3,0 -3,1.657 -2.329,3 -1.5,3 -0.671,3 0,1.657 0,0"/></g><g transform="translate(28,10)" id="g48"><path id="path50" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.657 -0.672,-3 -1.5,-3 -2.328,-3 -3,-1.657 -3,0 -3,1.657 -2.328,3 -1.5,3 -0.672,3 0,1.657 0,0"/></g><g transform="translate(11,24)" id="g52"><path id="path54" style="fill:#272b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0,2 2,2 4,2 4,0 4,0 l 0,-2 c 0,0 0,-2 -2,-2 -2,0 -2,2 -2,2 l 0,2 z"/></g><g transform="translate(21,24)" id="g56"><path id="path58" style="fill:#272b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0,2 2,2 4,2 4,0 4,0 l 0,-2 c 0,0 0,-2 -2,-2 -2,0 -2,2 -2,2 l 0,2 z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#99AAB5" d="M4 8s-4 2-4 11c0 0 6-1 7-3 0 0 2-12.25-3-8zm27.995.043s4 2 4 11c0 0-6-.999-7-2.999 0 0-2-12.251 3-8.001z"/><path fill="#FFE8B6" d="M1 1c-1.01.99 1 8 5 9s4-5 3-5C5 5 3.042-1 1 1zm34.297 0c1.011.99-1 8-5 9s-4-5-3-5c4 0 5.959-6 8-4z"/><path fill="#CCD6DD" d="M21.976 31h-7.951C8.488 31 4 26.512 4 20.976v-8.951C4 6.488 8.488 2 14.025 2h7.951C27.512 2 32 6.488 32 12.025v8.951C32 26.512 27.512 31 21.976 31z"/><path fill="#E6AAAA" d="M35 28c0 5.522-4.478 8-10 8H11c-5.523 0-10-2.478-10-8s4.477-10 10-10h14c5.522 0 10 4.478 10 10z"/><ellipse fill="#C1694F" cx="9.5" cy="26" rx="1.5" ry="3"/><ellipse fill="#C1694F" cx="26.5" cy="26" rx="1.5" ry="3"/><path fill="#272B2B" d="M11 12s0-2 2-2 2 2 2 2v2s0 2-2 2-2-2-2-2v-2zm10 0s0-2 2-2 2 2 2 2v2s0 2-2 2-2-2-2-2v-2z"/></svg> \ No newline at end of file |