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-1f468.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-1f468.svg')
-rw-r--r-- | public/emoji/1f469-200d-2764-fe0f-200d-1f468.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f469-200d-2764-fe0f-200d-1f468.svg b/public/emoji/1f469-200d-2764-fe0f-200d-1f468.svg index 9f42ccee8..b01d6565e 100644 --- a/public/emoji/1f469-200d-2764-fe0f-200d-1f468.svg +++ b/public/emoji/1f469-200d-2764-fe0f-200d-1f468.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,0 36,0 36,36 0,36 0,0 Z"/></clipPath><clipPath id="clipPath46" clipPathUnits="userSpaceOnUse"><path id="path48" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath62" clipPathUnits="userSpaceOnUse"><path id="path64" d="M 0,0 36,0 36,36 0,36 0,0 Z"/></clipPath><clipPath id="clipPath92" clipPathUnits="userSpaceOnUse"><path id="path94" 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(3,36)" id="g20"><path id="path22" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.721,0 -3.343,-0.406 -4.793,-1.111 -5.186,-1.042 -5.588,-1 -6,-1 c -3.866,0 -7,-3.134 -7,-7 l 0,-12 0.018,0 c 0.183,-6.467 5.471,-11.656 11.982,-11.656 6.511,0 11.799,5.189 11.982,11.656 l 0.018,0 0,9 C 11,-4.925 6.075,0 0,0"/></g><g transform="translate(11,9)" id="g24"><path id="path26" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,0 -16,0 -1,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-5 5,0 16,0 5,0 0,5 C 4,-1.791 2.209,0 0,0"/></g><path id="path28" style="fill:#7450a8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 11,0 -1,0 0,4 1,0 0,-4 z"/><g transform="translate(4.9995,8.0049)" id="g30"><path id="path32" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,4.995 -6,0 0,-5 0,0 c 0,-1.657 1.344,-3 3,-3 1.658,0 3,1.343 3,3 0,0.002 0,0.003 0,0.005"/></g><g transform="translate(-2,31)" id="g34"><path id="path36" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5,0 0,-12 c 0,-4.971 4.029,-9 9,-9 4.971,0 9,4.029 9,9 l 0,5.019 C 1.89,-6.605 0,0 0,0"/></g><g transform="translate(6,14)" id="g38"><path id="path40" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4,0 -4,0 c 0,0 1,-2 4,-2 3,0 4,2 4,2"/></g></g></g><g id="g42"><g clip-path="url(#clipPath46)" id="g44"><g transform="translate(6,20)" id="g50"><path id="path52" style="fill:#662113;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"/></g><g transform="translate(3,16.5)" id="g54"><path id="path56" style="fill:#c1694f;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 0,1 C 0.276,1 0.5,0.776 0.5,0.5 0.5,0.224 0.276,0 0,0"/></g></g></g><g id="g58"><g clip-path="url(#clipPath62)" id="g60"><g transform="translate(44,25)" id="g66"><path id="path68" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-6.075 -4.925,-11 -11,-11 -6.075,0 -11,4.925 -11,11 0,6.075 4.925,11 11,11 C -4.925,11 0,6.075 0,0"/></g><g transform="translate(37,9)" id="g70"><path id="path72" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,5 -6,5 -6,0 -8,0 -8,-8 2,-8 2,0 0,0 Z"/></g><g transform="translate(42,31)" id="g74"><path id="path76" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-7 c -8.453,0 -11.94,3.471 -13.266,5.524 -0.42,-1.803 -1.437,-4.699 -3.734,-5.368 L -17,-12 c 0,-4.971 4.029,-9 9,-9 4.971,0 9,4.029 9,9 L 1,0 0,0 Z"/></g><g transform="translate(25,9)" id="g78"><path id="path80" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 6,0 9,-5 12,0.094 18,0 c 2.209,0 4,-1.791 4,-4 l 0,-5 -5,0 -16,0 -5,0 0,5 c 0,2.209 1.791,4 4,4"/></g><path id="path82" style="fill:#2a6797;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 25,0 1,0 0,4 -1,0 0,-4 z"/><g transform="translate(30,14)" id="g84"><path id="path86" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 4,0 8,0 C 8,0 7,-2 4,-2 1,-2 0,0 0,0"/></g></g></g><g id="g88"><g clip-path="url(#clipPath92)" id="g90"><g transform="translate(30,20)" id="g96"><path id="path98" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.553,3 0,3 0.553,3 1,2.552 1,2 L 1,1 C 1,0.448 0.553,0 0,0"/></g><g transform="translate(35,16.5)" id="g100"><path id="path102" style="fill:#c1694f;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 0,1 C 0.276,1 0.5,0.776 0.5,0.5 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(26.5385,31.2891)" id="g104"><path id="path106" 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="M33 0c-6.075 0-11 4.925-11 11s4.925 11 11 11c1.041 0 2.045-.154 3-.425V.425C35.045.154 34.041 0 33 0z"/><path fill="#4289C1" d="M25 27c-2.209 0-4 1.791-4 4v5h15v-9H25z"/><path fill="#2A6797" d="M25 32h1v4h-1z"/><path fill="#FFDC5D" d="M36 11.28c-4.23-1.125-6.313-3.328-7.266-4.804-.42 1.804-1.438 4.699-3.734 5.369V17c0 .589.061 1.162.168 1.719.61 3.15 2.863 5.706 5.832 6.757V27l3 5 2-3.396V11.28z"/><path fill="#C1694F" d="M30 22s.293.558 1 1.085c.63.469 1.587.915 3 .915.809 0 1.462-.151 2-.363V22h-6zm5-2.5h-2c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h2c.276 0 .5.224.5.5s-.224.5-.5.5z"/><path fill="#662113" d="M30 16c-.553 0-1-.448-1-1v-1c0-.552.447-1 1-1s1 .448 1 1v1c0 .552-.447 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.75 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 |