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/1f6eb.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/1f6eb.svg')
-rw-r--r-- | public/emoji/1f6eb.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f6eb.svg b/public/emoji/1f6eb.svg index 5a76b58c2..7bcbb8c96 100644 --- a/public/emoji/1f6eb.svg +++ b/public/emoji/1f6eb.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="clipPath20" clipPathUnits="userSpaceOnUse"><path id="path22" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath60" clipPathUnits="userSpaceOnUse"><path id="path62" d="M 27.773,30.958 8.715,26.828 C 6.826,26.419 2.178,23.942 2.615,21.925 l 0,0 c 0.409,-1.888 7.678,-1.917 9.567,-1.508 l 0,0 17.073,3.699 c 1.889,0.41 6.127,2.42 5.717,4.309 l 0,0 c -0.35,1.617 -3.99,2.621 -6.216,2.621 l 0,0 c -0.375,0 -0.71,-0.029 -0.983,-0.088"/></clipPath><clipPath id="clipPath72" clipPathUnits="userSpaceOnUse"><path id="path74" 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"><path id="path12" style="fill:#5d9040;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 36,0 36,13 0,13 0,0 Z"/><path id="path14" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,5 36,0 0,5.999 -36,0 L 0,5 Z"/><g id="g16"><g clip-path="url(#clipPath20)" id="g18"><g transform="translate(10,8)" id="g24"><path id="path26" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.448,-1 -1,-1 l -6,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 l 6,0 C -0.448,1 0,0.553 0,0"/></g><g transform="translate(22,8)" id="g28"><path id="path30" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -6,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 l 6,0 C -0.447,1 0,0.553 0,0"/></g><g transform="translate(34,8)" id="g32"><path id="path34" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -6,0 c -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 l 6,0 C -0.447,1 0,0.553 0,0"/></g><g transform="translate(20.4995,19.6614)" id="g36"><path id="path38" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.176,-0.81 -0.339,-1.608 -1.148,-1.784 -0.81,-0.175 -1.608,0.339 -1.783,1.148 -0.176,0.81 0.338,1.609 1.148,1.784 C -0.974,1.324 -0.175,0.809 0,0"/></g><g transform="translate(29.9554,23.2466)" id="g40"><path id="path42" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.176,-0.81 -0.339,-1.608 -1.149,-1.784 -0.809,-0.176 -1.608,0.339 -1.784,1.149 -0.175,0.809 0.34,1.608 1.149,1.783 C -0.974,1.324 -0.175,0.809 0,0"/></g><g transform="translate(28.7659,24.0121)" id="g44"><path id="path46" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.058,-0.27 -0.113,-0.536 -0.383,-0.595 -0.27,-0.058 -0.536,0.113 -0.594,0.383 L -1.4,1.743 c -0.06,0.27 0.112,0.536 0.382,0.594 0.27,0.059 0.536,-0.112 0.595,-0.382 L 0,0 Z"/></g><g transform="translate(16.3536,24.6635)" id="g48"><path id="path50" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.037,-1.093 8.003,0.963 5.677,2.258 -1.386,6.813 -7.25,6.75 -5.489,5.106 -3.504,3.256 -2.18,1.879 0,0"/></g><g transform="translate(34.9724,28.4249)" id="g52"><path id="path54" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.409,-1.888 -3.829,-3.899 -5.717,-4.308 l -17.073,-3.7 c -1.889,-0.409 -9.158,-0.38 -9.567,1.508 -0.438,2.017 4.21,4.494 6.1,4.903 l 19.058,4.13 C -5.311,2.942 -0.409,1.89 0,0"/></g></g></g><g id="g56"><g clip-path="url(#clipPath60)" id="g58"><g transform="translate(29.4874,29.9065)" id="g64"><path id="path66" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.469,0.377 1.317,0.637 1.605,1.227 1.892,1.817 3.701,1.282 3.386,0.671 3.071,0.058 2.056,-0.93 0.843,-1.384 -0.369,-1.839 -0.545,-0.438 0,0"/></g></g></g><g id="g68"><g clip-path="url(#clipPath72)" id="g70"><g transform="translate(2.5305,22.313)" id="g76"><path id="path78" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.177,0.818 -1.27,5.86 -1.447,6.678 -1.979,9.133 2.141,5.933 4.31,3.833 2.524,2.912 0.819,1.926 0,0"/></g><g transform="translate(27.9197,27.9199)" id="g80"><path id="path82" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.116,-0.54 -0.226,-1.072 -0.766,-1.189 -0.54,-0.117 -1.072,0.226 -1.189,0.765 -0.117,0.54 0.225,1.072 0.765,1.189 C -0.649,0.882 -0.117,0.54 0,0"/></g><g transform="translate(24.9871,27.2844)" id="g84"><path id="path86" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.117,-0.539 -0.225,-1.072 -0.765,-1.189 -0.54,-0.117 -1.073,0.226 -1.19,0.766 -0.116,0.539 0.226,1.072 0.766,1.189 C -0.648,0.883 -0.116,0.54 0,0"/></g><g transform="translate(22.0554,26.6494)" id="g88"><path id="path90" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.116,-0.54 -0.225,-1.072 -0.766,-1.189 -0.54,-0.117 -1.072,0.226 -1.189,0.766 C -2.072,0.116 -1.73,0.648 -1.19,0.765 -0.649,0.883 -0.117,0.539 0,0"/></g><g transform="translate(19.1237,26.0144)" id="g92"><path id="path94" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.117,-0.54 -0.226,-1.072 -0.766,-1.189 -0.54,-0.117 -1.072,0.225 -1.189,0.765 -0.117,0.54 0.225,1.072 0.766,1.189 C -0.649,0.882 -0.117,0.539 0,0"/></g><g transform="translate(16.1913,25.3785)" id="g96"><path id="path98" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.117,-0.54 -0.225,-1.072 -0.766,-1.189 -0.54,-0.117 -1.071,0.226 -1.189,0.766 -0.117,0.539 0.226,1.072 0.766,1.189 C -0.649,0.883 -0.117,0.54 0,0"/></g><g transform="translate(13.2597,24.7435)" id="g100"><path id="path102" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.117,-0.54 -0.226,-1.072 -0.766,-1.189 -0.54,-0.117 -1.072,0.226 -1.189,0.766 -0.117,0.539 0.225,1.071 0.766,1.189 C -0.649,0.883 -0.117,0.54 0,0"/></g><g transform="translate(3.3783,22.0907)" id="g104"><path id="path106" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.872,0.759 4.017,1.382 2.407,-1.013 0.111,-4.58 -2.12,-4.999 -1.655,-3.876 -1.129,-2.611 -0.61,-1.316 0,0"/></g><g transform="translate(15.6321,22.7954)" id="g108"><path id="path110" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.492,1.418 7.691,2.434 6.106,0.3 1.556,-6.768 -3.808,-9.138 -2.885,-6.912 -1.844,-4.406 -1.209,-2.605 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#5D9040" d="M36 23v13H0V23h36z"/><path fill="#CCD6DD" d="M0 25h36v6H0z"/><path fill="#F5F8FA" d="M10 28c0 .553-.448 1-1 1H3c-.552 0-1-.447-1-1 0-.553.448-1 1-1h6c.552 0 1 .447 1 1zm12 0c0 .553-.447 1-1 1h-6c-.552 0-1-.447-1-1 0-.553.448-1 1-1h6c.553 0 1 .447 1 1zm12 0c0 .553-.447 1-1 1h-6c-.553 0-1-.447-1-1 0-.553.447-1 1-1h6c.553 0 1 .447 1 1z"/><circle fill="#67757F" cx="19.034" cy="16.656" r="1.5"/><circle fill="#67757F" cx="28.489" cy="13.071" r="1.5"/><path fill="#5DADEC" d="M16.354 11.337c1.037 1.093 8.003-.963 5.677-2.258C14.968 4.524 9.104 4.587 10.865 6.23c1.984 1.85 3.309 3.227 5.489 5.107z"/><path fill="#CCD6DD" d="M34.972 7.575c.409 1.889-3.829 3.899-5.718 4.308l-17.072 3.699c-1.889.409-9.158.381-9.567-1.508-.437-2.017 4.211-4.494 6.1-4.903l19.058-4.129c1.888-.409 6.79.644 7.199 2.533z"/><path fill="#67757F" d="M30.844 5.181c-.38.378-.982.612-1.356.913-.545.438-.369 1.839.843 1.384 1.038-.389 1.928-1.168 2.361-1.768-.581-.224-1.216-.403-1.848-.529z"/><path fill="#5DADEC" d="M2.586 13.7c-.177-.818-1.325-5.873-1.502-6.691-.532-2.455 3.588.745 5.756 2.845-1.785.921-3.434 1.92-4.254 3.846zm.792.209c.872-.759 4.017-1.382 2.407 1.013-2.296 3.567-4.528 3.986-4.062 2.863.526-1.265 1.045-2.56 1.655-3.876zm12.254-.704c.492-1.418 7.691-2.434 6.106-.3-4.55 7.068-9.914 9.438-8.991 7.212 1.041-2.506 1.676-4.307 2.885-6.912z"/><circle fill="#9AAAB4" cx="26.942" cy="8.292" r="1"/><circle fill="#9AAAB4" cx="24.01" cy="8.927" r="1"/><circle fill="#9AAAB4" cx="21.078" cy="9.563" r="1"/><circle fill="#9AAAB4" cx="18.146" cy="10.198" r="1"/><circle fill="#9AAAB4" cx="15.214" cy="10.833" r="1"/><circle fill="#9AAAB4" cx="12.282" cy="11.468" r="1"/></svg> \ No newline at end of file |