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/1f469-200d-2764-fe0f-200d-1f469.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/1f469-200d-2764-fe0f-200d-1f469.svg')
-rw-r--r-- | public/emoji/1f469-200d-2764-fe0f-200d-1f469.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f469-200d-2764-fe0f-200d-1f469.svg b/public/emoji/1f469-200d-2764-fe0f-200d-1f469.svg index 804903c75..70fc6b7c2 100644 --- a/public/emoji/1f469-200d-2764-fe0f-200d-1f469.svg +++ b/public/emoji/1f469-200d-2764-fe0f-200d-1f469.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(11,19)" id="g20"><path id="path22" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.917 -2.507,-7.241 -6,-8.477 l 0,-1.523 5,0 1,0 c 0.148,0 0.287,-0.028 0.431,-0.043 C 1.96,-8.089 2.907,-5.657 2.982,-3 L 3,-3 3,6 c 0,6.075 -4.925,11 -11,11 -1.044,0 -2.045,-0.165 -3,-0.44 l 0,-7.578 C -9.207,7.187 -5.92,5.219 0,5.019 L 0,0 Z"/></g><g transform="translate(11.431,8.9565)" id="g24"><path id="path26" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.143,0.016 -0.283,0.043 -0.431,0.043 l -1,0 -5,0 0,-0.995 c 0,-0.002 0,-0.003 0,-0.005 0,-1.657 -1.343,-3 -3,-3 -0.772,0 -1.468,0.3 -2,0.779 l 0,-5.779 15,0 0,5 C 3.569,-1.895 2.003,-0.218 0,0"/></g><path id="path28" style="fill:#7450a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 10,0 1,0 0,4 -1,0 0,-4 z"/><g transform="translate(5,8)" id="g30"><path id="path32" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.002 0,0.003 0,0.005 L 0,1 0,2.523 C -0.94,2.19 -1.947,2 -3,2 -3.688,2 -4.356,2.084 -5,2.231 l 0,-4.452 C -4.468,-2.7 -3.772,-3 -3,-3 c 1.657,0 3,1.343 3,3"/></g><g transform="translate(5,21)" id="g34"><path id="path36" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,1 C 0,1.552 0.448,2 1,2 1.552,2 2,1.552 2,1 L 2,0 C 2,-0.552 1.552,-1 1,-1 0.448,-1 0,-0.552 0,0 m -2,-4.5 -2,0 c -0.276,0 -0.5,0.224 -0.5,0.5 0,0.276 0.224,0.5 0.5,0.5 l 2,0 c 0.276,0 0.5,-0.224 0.5,-0.5 0,-0.276 -0.224,-0.5 -0.5,-0.5 m 2,-5.977 C 3.493,-9.241 6,-5.917 6,-2 L 6,3.019 C 0.08,3.219 -3.207,5.187 -5,6.982 L -5,-7 l 2,0 4,0 c 0,0 -1,-2 -4,-2 -0.809,0 -1.462,0.151 -2,0.363 l 0,-2.132 c 0.644,-0.147 1.312,-0.231 2,-0.231 1.053,0 2.06,0.19 3,0.523"/></g><g transform="translate(6,14)" id="g38"><path id="path40" style="fill:#bb1a34;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4,0 -2,0 0,-1.637 C -5.462,-1.849 -4.809,-2 -4,-2 c 3,0 4,2 4,2"/></g><g transform="translate(7,21)" id="g42"><path id="path44" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,1 C 0,1.552 -0.448,2 -1,2 -1.552,2 -2,1.552 -2,1 l 0,-1 c 0,-0.552 0.448,-1 1,-1 0.552,0 1,0.448 1,1"/></g><g transform="translate(3,17.5)" id="g46"><path id="path48" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2,0 C -2.276,0 -2.5,-0.224 -2.5,-0.5 -2.5,-0.776 -2.276,-1 -2,-1 l 2,0 c 0.276,0 0.5,0.224 0.5,0.5 C 0.5,-0.224 0.276,0 0,0"/></g><g transform="translate(25,19)" id="g50"><path id="path52" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-3.917 2.507,-7.241 6,-8.477 L 6,-10 l -5,0 -1,0 c -0.148,0 -0.287,-0.028 -0.431,-0.043 C -1.96,-8.089 -2.907,-5.657 -2.982,-3 L -3,-3 -3,6 c 0,6.075 4.925,11 11,11 1.044,0 2.045,-0.165 3,-0.44 L 11,8.982 C 9.207,7.187 5.92,5.219 0,5.019 L 0,0 Z"/></g><g transform="translate(24.569,8.9565)" id="g54"><path id="path56" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.143,0.016 0.283,0.043 0.431,0.043 l 1,0 5,0 0,-0.995 c 0,-0.002 0,-0.003 0,-0.005 0,-1.657 1.343,-3 3,-3 0.772,0 1.468,0.3 2,0.779 l 0,-5.779 -15,0 0,5 c 0,2.062 1.566,3.739 3.569,3.957"/></g><g transform="translate(26,4)" id="g58"><path id="path60" style="fill:#7450a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-4 -1,0 0,4 1,0 z"/></g><g transform="translate(31,8)" id="g62"><path id="path64" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0.002 0,0.003 0,0.005 L 0,1 0,2.523 C 0.94,2.19 1.947,2 3,2 3.688,2 4.356,2.084 5,2.231 L 5,-2.221 C 4.468,-2.7 3.772,-3 3,-3 1.343,-3 0,-1.657 0,0"/></g><g transform="translate(30,20)" id="g66"><path id="path68" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.552,3 0,3 0.552,3 1,2.552 1,2 L 1,1 C 1,0.448 0.552,0 0,0 m 2.5,-3 c 0,0.276 0.224,0.5 0.5,0.5 l 2,0 C 5.276,-2.5 5.5,-2.724 5.5,-3 5.5,-3.276 5.276,-3.5 5,-3.5 l -2,0 C 2.724,-3.5 2.5,-3.276 2.5,-3 M 4,-10 c 0.688,0 1.356,0.084 2,0.231 l 0,2.132 C 5.462,-7.849 4.809,-8 4,-8 1,-8 0,-6 0,-6 l 4,0 2,0 0,13.982 C 4.207,6.187 0.92,4.219 -5,4.019 L -5,-1 C -5,-4.917 -2.493,-8.241 1,-9.477 1.94,-9.81 2.947,-10 4,-10"/></g><g transform="translate(30,14)" id="g70"><path id="path72" style="fill:#bb1a34;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 4,0 6,0 6,-1.637 C 5.462,-1.849 4.809,-2 4,-2 1,-2 0,0 0,0"/></g><g transform="translate(29,21)" id="g74"><path id="path76" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,1 C 0,1.552 0.448,2 1,2 1.552,2 2,1.552 2,1 L 2,0 C 2,-0.552 1.552,-1 1,-1 0.448,-1 0,-0.552 0,0"/></g><g transform="translate(33,17.5)" id="g78"><path id="path80" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 2,0 C 2.276,0 2.5,-0.224 2.5,-0.5 2.5,-0.776 2.276,-1 2,-1 l -2,0 c -0.276,0 -0.5,0.224 -0.5,0.5 0,0.276 0.224,0.5 0.5,0.5"/></g><g transform="translate(26.5385,31.2891)" id="g82"><path id="path84" style="fill:#e75a70;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,2.601 -2.109,4.711 -4.711,4.711 -1.579,0 -2.972,-0.78 -3.828,-1.972 -0.855,1.192 -2.249,1.972 -3.827,1.972 -2.602,0 -4.711,-2.11 -4.711,-4.711 0,-0.369 0.047,-0.727 0.127,-1.07 0.654,-4.065 5.173,-8.353 8.411,-9.53 3.238,1.177 7.758,5.465 8.412,9.529 C -0.047,-0.727 0,-0.369 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFAC33" d="M13.982 20H14v-9C14 4.925 9.075 0 3 0 1.956 0 .955.165 0 .44v31.037c.652.11 1.317.179 2 .179 6.511 0 11.799-5.189 11.982-11.656z"/><path fill="#9268CA" d="M11.431 27C11.287 26.984 0 27 0 27v9h15v-5c0-2.061-1.566-3.782-3.569-4z"/><path fill="#7450A8" d="M10 32h1v4h-1z"/><path fill="#FFDC5D" d="M0 8.018v22.204C.532 30.7 1.228 31 2 31c1.657 0 3-1.343 3-3v-2.523c3.494-1.237 6-4.56 6-8.477v-5.019c-5.92-.2-9.207-2.168-11-3.963z"/><path fill="#DF1F32" d="M0 22v1.637c.538.212 1.191.363 2 .363 1.413 0 2.369-.445 3-.915C5.707 22.558 6 22 6 22H0z"/><path fill="#C1694F" d="M3 19.5H1c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h2c.276 0 .5.224.5.5s-.224.5-.5.5z"/><path fill="#662113" d="M6 16c-.552 0-1-.448-1-1v-1c0-.552.448-1 1-1s1 .448 1 1v1c0 .552-.448 1-1 1z"/><path fill="#FFAC33" d="M22.018 20H22v-9c0-6.075 4.925-11 11-11 1.044 0 2.045.165 3 .44v31.037c-.652.11-1.317.179-2 .179-6.511 0-11.799-5.189-11.982-11.656z"/><path fill="#9268CA" d="M24.569 27C24.713 26.984 36 27 36 27v9H21v-5c0-2.061 1.566-3.782 3.569-4z"/><path fill="#7450A8" d="M25 32h1v4h-1z"/><path fill="#FFDC5D" d="M36 8.018v22.204c-.532.478-1.228.778-2 .778-1.657 0-3-1.343-3-3v-2.523c-3.494-1.237-6-4.56-6-8.477v-5.019c5.92-.2 9.207-2.168 11-3.963z"/><path fill="#DF1F32" d="M36 22v1.637c-.538.212-1.191.363-2 .363-1.413 0-2.369-.445-3-.915-.707-.527-1-1.085-1-1.085h6z"/><path fill="#C1694F" d="M33 19.5h2c.276 0 .5-.224.5-.5s-.224-.5-.5-.5h-2c-.276 0-.5.224-.5.5s.224.5.5.5z"/><path fill="#662113" d="M30 16c.552 0 1-.448 1-1v-1c0-.552-.448-1-1-1s-1 .448-1 1v1c0 .552.448 1 1 1z"/><path fill="#E75A70" d="M26.539 4.711c0-2.602-2.11-4.711-4.711-4.711C20.249 0 18.855.78 18 1.972 17.144.78 15.751 0 14.172 0c-2.601 0-4.711 2.109-4.711 4.711 0 .369.047.727.127 1.07.654 4.065 5.173 8.353 8.411 9.529 3.238-1.177 7.758-5.465 8.412-9.528.081-.344.128-.702.128-1.071z"/></svg> \ No newline at end of file |