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/1f9dc-1f3fb-200d-2642-fe0f.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/1f9dc-1f3fb-200d-2642-fe0f.svg')
-rw-r--r-- | public/emoji/1f9dc-1f3fb-200d-2642-fe0f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f9dc-1f3fb-200d-2642-fe0f.svg b/public/emoji/1f9dc-1f3fb-200d-2642-fe0f.svg index c6d8341d5..d2167b4ae 100644 --- a/public/emoji/1f9dc-1f3fb-200d-2642-fe0f.svg +++ b/public/emoji/1f9dc-1f3fb-200d-2642-fe0f.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(29.6374,17.3642)" id="g20"><path id="path22" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.305,0.612 -1.02,0.844 -1.589,0.515 l -3.101,-1.789 -1.718,3.443 0.012,0.009 c -0.171,0.34 -0.336,0.669 -0.502,0.973 L -6.909,3.174 C -6.911,3.177 -6.914,3.179 -6.915,3.182 -7.373,4.015 -7.84,4.636 -8.466,4.636 l -10.014,0 -0.113,0 C -18.959,4.632 -19.281,4.469 -19.524,4.161 L -20.32,3.152 c -0.25,-0.289 -0.494,-0.597 -0.713,-0.904 l -5.2,-6.589 c -0.425,-0.54 -0.332,-1.33 0.207,-1.756 0.54,-0.426 1.33,-0.333 1.756,0.207 l 5.821,7.378 0.812,-6.856 -0.725,-3.971 9.386,0 -0.661,3.971 0.77,7.128 2.664,-5.34 c 0.305,-0.611 1.02,-0.843 1.588,-0.515 l 4.136,2.386 C 0.089,-1.381 0.305,-0.612 0,0"/></g><g transform="translate(14,25)" id="g24"><path id="path26" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-4 c 0,-1.104 0.896,-2 2,-2 1.105,0 2,0.896 2,2 L 4,0 0,0 Z"/></g><g transform="translate(18,26)" id="g28"><path id="path30" style="fill:#eec2ad;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4,-0.019 -4,-4 c 0,0 2,-1 4,0 l 0,4 z"/></g><g transform="translate(21,31)" id="g32"><path id="path34" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -10,0.952 -10,-4 -10,-4.001 C -10,-6.763 -7.762,-9 -5,-9 c 2.762,0 5,2.237 5,4.999 L 0,-4 0,0 Z"/></g><g transform="translate(18,24)" id="g36"><path id="path38" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 -2,0 c 0,0 0,-1 2,-1 2,0 2,1 2,1"/></g><g transform="translate(14,27.5)" id="g40"><path id="path42" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 -1,0.276 -0.776,0.5 -0.5,0.5 -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(19,27.5)" id="g44"><path id="path46" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 -1,0.276 -0.776,0.5 -0.5,0.5 -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(15,26)" id="g48"><path id="path50" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1,0 2,0 C 2,0 2,-1 1,-1 0,-1 0,0 0,0"/></g><g transform="translate(16.0002,34.9569)" id="g52"><path id="path54" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 3.433,0 5.578,-2.533 5.578,-4.644 0,-2.11 -0.429,-2.955 -0.858,-2.11 -0.43,0.844 -0.859,1.688 -0.859,1.688 0,0 -2.574,0 -3.432,0.845 0,0 1.287,-2.533 -1.287,0 0,0 0.429,-1.689 -2.145,0.421 0,0 -1.288,-0.844 -1.717,-2.954 -0.119,-0.586 -0.858,0 -0.858,2.11 C -5.578,-2.533 -3.862,0 0,0"/></g><g transform="translate(10,5)" id="g56"><path id="path58" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 8,0 c 1.65,0 3,1.35 3,3 l 0,1 C 11,5.1 10.1,6 9,6 L 0,6 C -1.65,6 -3,4.65 -3,3 l 0,0 C -3,1.35 -1.65,0 0,0"/></g><g transform="translate(7.2781,9.2514)" id="g60"><path id="path62" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.043,-2.463 0.19,-6.077 3.722,-7.251 1.979,-0.659 6.075,-1.291 9.662,-0.659 4.291,0.758 7.397,3.474 7.397,3.474 l -1.725,1.492 c 0,0 -2.22,-0.764 -4.334,-0.861 -3.894,-0.179 -8.488,2.926 -11,3.554 C 0.844,0.468 0,0 0,0"/></g><g transform="translate(25.7565,4.3258)" id="g64"><path id="path66" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.651,0.742 -0.535,2.842 0.968,4.161 2.253,1.98 2.912,3.983 3.663,4.642 0,0 0.88,-3.988 -1.374,-5.967 0,0 3.832,2.537 6.382,1.701 C 5.92,2.956 5.836,0.448 3.564,-0.368 1.682,-1.044 0.651,-0.742 0,0"/></g><g transform="translate(19.4473,5.7314)" id="g68"><path id="path70" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.023,0 -0.049,0.002 -0.073,0.007 -2.313,0.453 -6.86,2.554 -7.052,2.644 -7.24,2.73 -7.322,2.953 -7.235,3.141 -7.148,3.33 -6.923,3.412 -6.737,3.323 -6.69,3.302 -2.08,1.171 0.073,0.743 0.276,0.702 0.408,0.505 0.368,0.302 0.332,0.123 0.176,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F7DECE" d="M29.637 18.636c-.305-.612-1.02-.844-1.589-.515l-3.102 1.79-1.718-3.444.012-.009c-.171-.34-.336-.669-.502-.972l-.011-.023c-.002-.003-.005-.005-.006-.008-.457-.834-.924-1.455-1.549-1.455H11.044c-.365.004-.688.167-.93.474l-.797 1.01c-.25.289-.494.597-.713.904l-5.199 6.589c-.426.54-.333 1.33.207 1.756s1.33.333 1.756-.207l5.821-7.378.811 6.856-.725 3.971h9.387L20 24.004l.77-7.128 2.664 5.34c.305.612 1.02.844 1.589.515l4.136-2.387c.568-.328.784-1.097.478-1.708z"/><path fill="#F7DECE" d="M14 11v4c0 1.104.896 2 2 2s2-.896 2-2v-4h-4z"/><path fill="#EEC2AD" d="M18 10l-4 .019V14s2 1 4 0v-4z"/><path fill="#F7DECE" d="M21 5l-10-.952V9c0 2.762 2.238 5 5 5s5-2.237 5-5V5z"/><path fill="#C1694F" d="M18 12h-4s0 1 2 1 2-1 2-1z"/><circle fill="#662113" cx="13.5" cy="8.5" r=".5"/><circle fill="#662113" cx="18.5" cy="8.5" r=".5"/><path fill="#C1694F" d="M15 10h2s0 1-1 1-1-1-1-1z"/><path fill="#292F33" d="M16 1.043c3.433 0 5.578 2.533 5.578 4.644s-.429 2.955-.858 2.111l-.858-1.688s-2.574 0-3.432-.845c0 0 1.287 2.533-1.287 0 0 0 .429 1.689-2.145-.422 0 0-1.287.844-1.716 2.955-.119.586-.858 0-.858-2.111-.002-2.111 1.714-4.644 5.576-4.644"/><path fill="#3B88C3" d="M10 31h8c1.65 0 3-1.35 3-3v-1c0-1.1-.9-2-2-2h-9c-1.65 0-3 1.35-3 3s1.35 3 3 3z"/><path fill="#3B88C3" d="M7.278 26.749C6.235 29.211 7.468 32.826 11 34c1.979.658 6.075 1.291 9.662.658 4.291-.757 7.397-3.473 7.397-3.473l-1.725-1.492s-2.22.764-4.334.861c-3.894.178-8.488-2.926-11-3.554-2.878-.719-3.722-.251-3.722-.251z"/><path fill="#3B88C3" d="M25.756 31.674c-.651-.742-.535-2.842.968-4.161 2.254-1.98 2.912-3.982 3.664-4.642 0 0 .88 3.988-1.374 5.968 0 0 3.832-2.537 6.382-1.701-3.719 1.581-3.803 4.089-6.075 4.905-1.882.675-2.913.373-3.565-.369z"/><path fill="#292F33" d="M19.447 30.269c-.023 0-.049-.002-.073-.007-2.24-.446-6.787-2.547-6.979-2.637-.188-.087-.27-.31-.183-.497.087-.189.312-.271.498-.183.046.021 4.657 2.152 6.81 2.58.203.041.335.238.295.441-.036.18-.192.303-.368.303z"/></svg> \ No newline at end of file |