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/1f9d7-1f3fc-200d-2640-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/1f9d7-1f3fc-200d-2640-fe0f.svg')
-rw-r--r-- | public/emoji/1f9d7-1f3fc-200d-2640-fe0f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f9d7-1f3fc-200d-2640-fe0f.svg b/public/emoji/1f9d7-1f3fc-200d-2640-fe0f.svg index 570da6962..28347d7b8 100644 --- a/public/emoji/1f9d7-1f3fc-200d-2640-fe0f.svg +++ b/public/emoji/1f9d7-1f3fc-200d-2640-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(32.75,0)" id="g20"><path id="path22" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -28.75,0 c -2.209,0 -4,1.791 -4,4 l 0,28 c 0,2.209 1.791,4 4,4 l 15.042,0 c 0,0 4.849,-0.569 4.541,-2 -0.351,-1.634 -2.454,-6.896 -2.541,-7.708 -0.174,-1.62 4.734,-4.394 4.5,-6.292 -0.734,-5.934 -3.5,-8.25 -2.505,-11.305 C -9.587,8.308 -6.034,7.977 -5.125,7.5 0.25,4.682 0.208,0 0,0"/></g><g transform="translate(30,0)" id="g24"><path id="path26" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -26,0 c -2.209,0 -4,1.791 -4,4 l 0,28 c 0,2.209 1.791,4 4,4 l 7.167,0 c 0,0 8.955,-0.862 8.843,-2.062 -0.174,-1.852 -3.64,-7.717 -2.51,-8.813 1.13,-1.096 4.432,-3.794 4.571,-5.542 C -7.75,17.339 -12.213,11.284 -9.846,6.28 -9.091,4.681 -4.785,5.323 -3.518,4.427 -0.356,2.193 0.304,0 0,0"/></g><g transform="translate(29.759,6.1815)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0.404,-0.278 1.516,-0.666 1.959,-0.82 1.472,-2.506 1.211,-2.746 0.951,-2.986 -0.976,-3.373 -2.716,-2.844 -4.31,-2.36 -3.121,-1.906 -1.972,-1.651 -0.822,-1.396 0,0 0,0"/></g><g transform="translate(28.3129,21.6835)" id="g32"><path id="path34" style="fill:#e2c196;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.076,-0.54 -2.32,-0.982 -2.873,-0.817 -0.416,0.124 -1.235,0.382 -1.887,0.379 -0.651,-0.002 -0.759,-0.342 -0.325,-1.021 0.435,-0.679 1.324,-1.039 2.032,-0.823 0.708,0.216 2.276,0.291 3.233,0.317 C 1.137,-1.939 0.809,0.406 0,0"/></g><g transform="translate(27.8503,21.3858)" id="g36"><path id="path38" style="fill:#e2c196;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.484,0.258 1.333,0.391 1.333,0.391 L 2.262,2.662 4.743,1.026 c 0,0 -1.65,-1.933 -2.05,-2.355 C 2.293,-1.75 0.923,-1.786 0.098,-1.67 -0.728,-1.554 -0.541,-0.288 0,0"/></g><g transform="translate(29.8218,9.8285)" id="g40"><path id="path42" style="fill:#e2c196;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -2.739,1.872 -2.937,1.076 -3.136,0.28 -0.685,-1.832 -0.091,-3.812 0.149,-4.611 1.588,-5.475 1.606,-3.891 1.636,-1.156 0,0 0,0"/></g><g transform="translate(27.1622,10.4994)" id="g44"><path id="path46" style="fill:#e2c196;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0.88,-1.752 1.766,-1.567 2.652,-1.383 4.985,1.438 5.687,2.508 6.388,3.578 6.105,6.179 4.519,4.925 2.932,3.67 0,0 0,0"/></g><g transform="translate(34.2248,14.0637)" id="g48"><path id="path50" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -6.368,-0.814 -3.193,-3.707 0,0 Z"/></g><g transform="translate(27.6224,13.8682)" id="g52"><path id="path54" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -2.369,-2.157 -2.583,-3.02 -0.215,-0.862 0.003,-3.663 -0.642,-6.25 -0.644,-2.586 1.08,-3.016 1.294,-2.154 0.215,0.862 1.879,4.738 1.504,6.036 -0.276,0.954 2.584,3.019 2.584,3.019 L 0,0 Z"/></g><g transform="translate(29.8073,16.7344)" id="g56"><path id="path58" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.291,-0.84 -1.944,-2.066 -3.733,-4.052 0.355,-0.378 2.395,-2.554 2.395,-2.554 0,0 6.032,2.286 6.952,5.358 C 6.408,1.401 4.123,2.895 4.123,2.895 4.123,2.895 1.233,0.802 0,0"/></g><g transform="translate(32.9316,28.4067)" id="g60"><path id="path62" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.245,-2.329 -2.919,-1.9 -2.91,0.122 0,0 Z"/></g><g transform="translate(33.4343,28.33)" id="g64"><path id="path66" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.954,-1.243 -2.435,-1.138 -3.838,-0.894 -1.338,0.233 -1.093,2.671 -0.44,4.083 0.658,1.422 2.83,1.498 3.959,0.631 C 0.811,2.953 0.954,1.243 0,0"/></g><g transform="translate(25.4507,28.0397)" id="g68"><path id="path70" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.942,1.226 -2.63,2.587 -2.806,3.374 -3.02,4.33 -2.97,5.328 -4.305,6.125 -5.146,6.628 -4.582,5.243 -4.459,3.409 c 0.071,-1.056 1.795,-3.768 2.764,-4.759 0.624,-0.638 3.457,-1.854 4.439,-3.974 0.166,-0.358 -0.009,-0.758 0.503,-1.569 0.85,-1.343 1.792,-2.849 1.11,-4.412 2.984,-0.156 5.481,1.221 5.481,1.221 -0.883,2.313 -0.212,4.329 -0.94,6.15 -1.149,2.879 -2.429,2.988 -4.35,2.598 C 3.082,-1.634 2.236,-0.763 0,0"/></g><g transform="translate(29.5918,18.3106)" id="g72"><path id="path74" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.984,-0.155 5.519,0.863 5.519,0.863 5.289,2.828 5.485,3.974 4.757,5.795 4.596,6.198 4.428,6.531 4.253,6.815 4.242,6.56 4.104,6.367 3.656,6.46 2.686,6.66 2.07,7.734 1.115,8.358 0.886,8.368 0.65,8.377 0.407,8.393 1.167,7.796 1.484,6.228 1.046,5.101 0.603,3.961 -0.427,4.045 -1.397,4.405 -1.359,4.327 -1.974,3.439 -1.459,2.637 -0.943,1.834 -0.029,1.019 0,0"/></g><g transform="translate(24.3,4.0152)" id="g76"><path id="path78" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0.371,-1.007 1.62,-0.869 1.897,-0.839 1.541,-2.033 1.23,-2.33 0.919,-2.626 -2.175,-4.049 -3.729,-3.185 -5.282,-2.322 -4.073,-1.977 -2.865,-1.632 -1.657,-1.287 0,0 0,0"/></g><g transform="translate(30.9355,33.0604)" id="g80"><path id="path82" style="fill:#ffe51e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.992,0.206 3.262,-0.867 3.451,-1.975 3.819,-4.126 2.449,-5.875 1.258,-5.53 0.731,-5.377 0.292,-4.983 0.185,-3.342 0.1,-2.046 -0.14,-0.271 -1.779,-1.541 -2.166,-1.841 -1.382,-0.143 0,0"/></g><g transform="translate(33.2291,31.9073)" id="g84"><path id="path86" style="fill:#ffe51e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.307,0.516 1.745,0.438 2.298,-0.7 2.85,-1.837 1.599,-3.87 1.514,-4.939 1.429,-6.009 2.017,-6.13 1.995,-6.364 1.973,-6.598 1.369,-7.226 0.561,-6.99 -0.247,-6.754 -2.223,-6.371 -0.686,-3.991 0.852,-1.612 0,0 0,0"/></g><g transform="translate(6.3333,33.5833)" id="g88"><path id="path90" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 4.708,0 C 5.5,0 2.5,-3.156 1.417,-3.156 0.333,-3.156 -1.417,0 0,0"/></g><g transform="translate(10.6667,27.375)" id="g92"><path id="path94" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 4.458,0 C 5.208,0 2,-2.949 1,-2.949 0,-2.949 -1.292,0 0,0"/></g><g transform="translate(8.875,18.2574)" id="g96"><path id="path98" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 9.125,0 C 10.417,0 3.583,-5.098 2.458,-5.098 1.333,-5.098 -2.458,0 0,0"/></g><g transform="translate(3.1667,6.9476)" id="g100"><path id="path102" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 8.071,0 C 9.958,0 4.79,-4.531 2.957,-4.531 1.125,-4.531 -1.833,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#66757F" d="M32.75 36H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h15.042s4.849.569 4.542 2c-.351 1.634-2.455 6.896-2.542 7.708-.173 1.62 4.735 4.393 4.5 6.292-.733 5.934-3.5 8.25-2.505 11.305.126.386 3.679.718 4.588 1.195C33 31.318 32.958 36 32.75 36z"/><path fill="#99AAB5" d="M30 36H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h7.167s8.955.862 8.842 2.062c-.173 1.851-3.639 7.717-2.51 8.812s4.432 3.794 4.571 5.542c.179 2.244-4.284 8.299-1.918 13.304.756 1.598 5.061.957 6.329 1.852C29.644 33.807 30.304 36 30 36z"/><path fill="#292F33" d="M29.759 29.818s.404.278 1.516.666c.443.154-.044 1.84-.305 2.08s-2.188.627-3.928.098c-1.593-.484-.405-.938.744-1.193 1.151-.254 1.973-1.651 1.973-1.651z"/><path fill="#E2C196" d="M28.313 14.316c-1.076.54-2.32.982-2.873.817-.415-.124-1.235-.382-1.886-.38-.651.002-.76.343-.325 1.021.435.679 1.324 1.039 2.032.823.708-.216 2.276-.29 3.233-.317.956-.025.628-2.369-.181-1.964z"/><path fill="#E2C196" d="M27.85 14.614c.484-.258 1.333-.391 1.333-.391l.929-2.272 2.482 1.636s-1.65 1.934-2.05 2.355c-.4.422-1.77.457-2.595.341-.826-.115-.64-1.381-.099-1.669zm1.972 11.558s-2.739-1.872-2.937-1.076c-.198.796 2.252 2.908 2.846 4.888.24.799 1.68 1.663 1.697.079.03-2.735-1.606-3.891-1.606-3.891z"/><path fill="#E2C196" d="M27.162 25.501s.88 1.752 1.766 1.567 3.219-3.005 3.92-4.075c.701-1.07.419-3.671-1.168-2.416-1.586 1.253-4.518 4.924-4.518 4.924z"/><path fill="#A0041E" d="M34.225 21.936l-6.368.815 3.175 2.892z"/><path fill="#F3D2A2" d="M27.622 22.132s-2.369 2.157-2.583 3.02c-.215.862.003 3.664-.642 6.25s1.079 3.016 1.294 2.154c.215-.862 1.879-4.738 1.504-6.035-.276-.955 2.584-3.02 2.584-3.02l-2.157-2.369z"/><path fill="#BE1931" d="M29.807 19.266c-1.291.84-1.944 2.066-3.733 4.052l2.395 2.554s6.032-2.286 6.953-5.358c.794-2.649-1.491-4.143-1.491-4.143s-2.89 2.092-4.124 2.895z"/><path fill="#F3D2A2" d="M32.932 7.593l-.245 2.329-2.675-.429.01-2.022z"/><path fill="#F3D2A2" d="M33.434 7.67c-.953 1.243-2.434 1.138-3.838.894-1.338-.233-1.093-2.671-.44-4.083.658-1.422 2.829-1.498 3.959-.631 1.131.867 1.273 2.577.319 3.82z"/><path fill="#F3D2A2" d="M25.451 7.96c-.942-1.226-2.63-2.587-2.806-3.374-.214-.957-.164-1.954-1.499-2.752-.842-.503-.278.882-.154 2.717.071 1.055 1.795 3.768 2.764 4.759.623.637 3.457 1.854 4.439 3.973.166.358-.01.759.503 1.569.85 1.343 1.792 2.849 1.109 4.412 2.984.155 5.482-1.221 5.482-1.221-.883-2.313-.212-4.329-.94-6.15-1.15-2.879-2.429-2.989-4.35-2.598-1.467.3-2.312-.572-4.548-1.335z"/><path fill="#DD2E44" d="M29.592 17.689c2.984.155 5.519-.863 5.519-.863-.23-1.965-.034-3.111-.761-4.932-.161-.404-.33-.736-.504-1.021-.011.256-.149.448-.597.356-.97-.2-1.585-1.274-2.541-1.898-.229-.01-.465-.019-.708-.035.76.597 1.077 2.165.639 3.292-.443 1.14-1.473 1.056-2.443.695.037.079-.578.966-.062 1.769.515.803 1.429 1.618 1.458 2.637z"/><path fill="#292F33" d="M24.3 31.985s.371 1.007 1.62.869c.277-.031-.079 1.164-.39 1.461-.311.297-3.405 1.719-4.959.855-1.553-.864-.345-1.208.864-1.553 1.208-.345 2.865-1.632 2.865-1.632z"/><path fill="#FFE51E" d="M30.936 2.94c1.992-.206 3.261.867 3.451 1.975.368 2.152-1.002 3.9-2.193 3.555-.526-.153-.965-.547-1.072-2.188-.085-1.296-.325-3.07-1.964-1.8-.388.299.395-1.399 1.778-1.542z"/><path fill="#FFE51E" d="M33.229 4.093c.307-.516 1.745-.438 2.298.7s-.699 3.17-.784 4.239.503 1.191.481 1.425-.626.861-1.434.626-2.784-.619-1.246-2.999c1.538-2.379.685-3.991.685-3.991z"/><path fill="#66757F" d="M6.333 2.417h4.708c.792 0-2.208 3.156-3.292 3.156S4.917 2.417 6.333 2.417zm4.334 6.208h4.458c.75 0-2.458 2.949-3.458 2.949s-2.292-2.949-1-2.949zm-1.792 9.118H18c1.292 0-5.542 5.098-6.667 5.098s-4.916-5.098-2.458-5.098zM3.167 29.052h8.071c1.888 0-3.281 4.531-5.113 4.531s-4.792-4.531-2.958-4.531z"/></svg> \ No newline at end of file |