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/1f379.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/1f379.svg')
-rw-r--r-- | public/emoji/1f379.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f379.svg b/public/emoji/1f379.svg index 7b4f6eebf..1c4db4636 100644 --- a/public/emoji/1f379.svg +++ b/public/emoji/1f379.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><clipPath id="clipPath56" clipPathUnits="userSpaceOnUse"><path id="path58" d="m 18.514,16.55 c -0.376,-0.78 0.601,-1.875 1.47,-0.483 l 0,0 c 0.868,1.39 6.741,13.697 6.741,13.697 l 0,0 -1.98,1.336 c 0,0 -5.922,-13.912 -6.231,-14.55"/></clipPath><clipPath id="clipPath72" clipPathUnits="userSpaceOnUse"><path id="path74" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath84" clipPathUnits="userSpaceOnUse"><path id="path86" d="m 16.468,33.733 c -0.336,-1.48 1.528,-4.291 7.891,-7.343 l 0,0 c 4.216,-2.022 6.661,-2.446 7.97,-2.446 l 0,0 10e-4,0 c 1.474,0 2.038,0.55 2.252,1.013 l 0,0 c 0.215,0.465 0.145,0.99 -0.185,1.419 l 0,0 c -1.019,1.582 -5.396,7.694 -5.584,7.956 l 0,0 C 28.625,34.594 28.322,34.75 28,34.75 l 0,0 c -1.459,0 -4.763,0.016 -7.233,0.029 l 0,0 c -1.481,0.007 -2.663,0.012 -2.975,0.012 l 0,0 c -0.648,0 -1.18,-0.424 -1.324,-1.058"/></clipPath><clipPath id="clipPath96" clipPathUnits="userSpaceOnUse"><path id="path98" 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(19,8.7451)" id="g20"><path id="path22" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 8,0.213 9.651,4.075 1.07,2.501 -0.609,9.554 -0.609,13.93 0,1.481 -1.167,2.25 -3.416,2.25 l -6.124,0 -1.125,0 -1.125,0 -6.123,0 c -1.125,0 -3.329,0.262 -3.329,-2.125 0,-4.284 -1.765,-11.341 -0.634,-13.815 C -10.958,0.213 -3,0 -3,0 l 0,-3.123 c 0,0 -4.584,-2.34 -5.498,-2.883 -0.984,-0.562 -0.33,-1.462 0.063,-1.617 0.657,-0.258 2.254,-1.102 6.781,-1.102 4.64,0 6.202,0.914 6.764,1.102 0.217,0.072 1.347,0.932 0.011,1.723 C 2.743,-4.492 0,-3.123 0,-3.123 L 0,0 Z"/></g><g transform="translate(28,27.5576)" id="g24"><path id="path26" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.621 -2.547,-2.935 -10.623,-2.935 -8.076,0 -10.623,1.314 -10.623,2.935 0,1.622 2.547,2.935 10.623,2.935 C -2.547,2.935 0,1.622 0,0"/></g><g transform="translate(8.4585,27.4165)" id="g28"><path id="path30" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2.042,-9.501 -2.417,-13.583 2.083,-15.167 5.432,-1.911 8.543,-1.592 13.459,0 4.5,1.459 1.5,6.875 2.125,14.792 C 17.828,1.662 0,0 0,0"/></g><g transform="translate(9.0415,21.4165)" id="g32"><path id="path34" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.083,-1.083 -1.09,-6.129 -0.625,-7.292 0.5,-1.25 1.75,-3.25 8.917,-3.25 5.25,0 8.584,1.584 9.125,3.584 0.47,1.74 -0.25,5.583 -0.334,7"/></g><g transform="translate(26,21.5)" id="g36"><path id="path38" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.829 -3.806,-1.5 -8.5,-1.5 -4.694,0 -8.5,0.671 -8.5,1.5 0,0.829 3.806,1.5 8.5,1.5 C -3.806,1.5 0,0.829 0,0"/></g><g transform="translate(24.7451,31.0991)" id="g40"><path id="path42" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -5.922,-13.911 -6.231,-14.549 -0.376,-0.781 0.601,-1.874 1.47,-0.484 0.868,1.391 6.741,13.698 6.741,13.698 L 0,0 Z"/></g><g transform="translate(17.3105,24.3247)" id="g44"><path id="path46" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -4.292,0 -7.672,1.007 -8.943,1.604 -9.444,1.838 -9.659,2.433 -9.424,2.933 -9.19,3.434 -8.595,3.649 -8.095,3.414 -8.02,3.379 -0.388,0.138 8.457,3.525 8.971,3.725 9.551,3.466 9.748,2.95 9.946,2.434 9.688,1.855 9.172,1.658 5.95,0.424 2.783,0 0,0"/></g><g transform="translate(28,34.75)" id="g48"><path id="path50" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.333,0 -9.375,0.042 -10.208,0.042 -1,0 -0.325,-2.987 7,-6.5 7.125,-3.418 9.501,-2.334 8.792,-1.5 C 4.626,-6.458 0,0 0,0"/></g></g></g><g id="g52"><g clip-path="url(#clipPath56)" id="g54"><g transform="translate(20.375,21.75)" id="g60"><path id="path62" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1,-0.5 1.875,-0.625 2.792,-0.5 0.917,0.125 0.75,-0.667 -0.25,-0.875 -1,-0.208 -2.833,-0.374 -4,-0.292 C -2.625,-1.583 0,0 0,0"/></g><g transform="translate(18.4585,20)" id="g64"><path id="path66" style="fill:#cc6f00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.167,0 3.751,0.167 4.459,0.333 5.167,0.5 4.875,-5.874 2.542,-5.833 0.209,-5.792 -2.25,-6.709 -1.75,-4.625 -1.25,-2.542 0,0 0,0"/></g></g></g><g id="g68"><g clip-path="url(#clipPath72)" id="g70"><g transform="translate(32.3301,23.9438)" id="g76"><path id="path78" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.001,0 c -1.309,0 -3.754,0.424 -7.97,2.446 -6.363,3.052 -8.228,5.863 -7.891,7.343 0.144,0.633 0.676,1.059 1.324,1.059 0.312,0 1.494,-0.006 2.974,-0.013 2.471,-0.013 5.775,-0.029 7.234,-0.029 0.322,0 0.625,-0.156 0.812,-0.417 C -3.329,10.127 1.048,4.014 2.067,2.432 2.397,2.003 2.467,1.479 2.252,1.013 2.038,0.551 1.474,0 0,0"/></g></g></g><g id="g80"><g clip-path="url(#clipPath84)" id="g82"><g transform="translate(29.584,34.0415)" id="g88"><path id="path90" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.916,-1.875 3.541,-8.708 -4.292,-8.458 -0.834,-11.75 -1.416,-17.001 3,-13.875 7.416,-10.75 9.874,-5.25 7.416,-3.292 4.958,-1.333 0,0 0,0"/></g></g></g><g id="g92"><g clip-path="url(#clipPath96)" id="g94"><g transform="translate(29.875,34.3125)" id="g100"><path id="path102" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.932 -0.756,-1.687 -1.687,-1.687 -0.932,0 -1.688,0.755 -1.688,1.687 0,0.932 0.756,1.687 1.688,1.687 C -0.756,1.687 0,0.932 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#8899A6" d="M19 27.255s8-.213 9.651-4.075c1.069-2.501-.609-9.554-.609-13.93 0-1.481-1.167-2.25-3.416-2.25H10.129C9.004 7 6.8 6.738 6.8 9.125c0 4.284-1.765 11.341-.634 13.815C8.042 27.042 16 27.255 16 27.255v3.123s-4.584 2.34-5.498 2.883c-.984.562-.33 1.462.063 1.617.656.258 2.253 1.102 6.78 1.102 4.641 0 6.202-.914 6.765-1.102.217-.072 1.347-.932.011-1.723C21.743 31.747 19 30.378 19 30.378v-3.123z"/><path fill="#CCD6DD" d="M28 8.442c0 1.621-2.547 2.935-10.623 2.935-8.076 0-10.623-1.314-10.623-2.935 0-1.622 2.547-2.935 10.623-2.935C25.453 5.507 28 6.821 28 8.442z"/><path fill="#CCD6DD" d="M8.458 8.583c2.042 9.5-2.417 13.583 2.083 15.167 5.432 1.911 8.542 1.593 13.458 0 4.5-1.458 1.5-6.875 2.125-14.792.162-2.037-17.666-.375-17.666-.375z"/><path fill="#F4900C" d="M9.042 14.583c-.083 1.083-1.09 6.129-.625 7.292.5 1.25 1.75 3.25 8.917 3.25 5.25 0 8.583-1.583 9.125-3.583.471-1.74-.25-5.583-.333-7"/><ellipse fill="#FFCC4D" cx="17.5" cy="14.5" rx="8.5" ry="1.5"/><path fill="#C1694F" d="M24.745 4.901s-5.922 13.911-6.231 14.549c-.377.78.601 1.874 1.47.483.868-1.391 6.741-13.698 6.741-13.698l-1.98-1.334z"/><path fill="#FFF" d="M17.31 11.675c-4.291 0-7.672-1.007-8.943-1.603-.5-.234-.715-.83-.481-1.33.234-.501.83-.716 1.33-.481.074.035 7.707 3.276 16.552-.111.514-.199 1.094.06 1.291.576.198.516-.061 1.094-.576 1.292-3.222 1.234-6.389 1.657-9.173 1.657z"/><path fill="#FFAC33" d="M20.698 14.386l-.661 1.544c.697-.02 1.447-.085 2.084-.173l.476-.97c-.617.011-1.236-.116-1.899-.401z"/><path fill="#CC6F00" d="M18.514 19.45c-.377.78.601 1.874 1.47.483.288-.462 1.129-2.129 2.122-4.147-.589.065-1.355.121-2.077.161-.807 1.884-1.421 3.309-1.515 3.503z"/><path fill="#77B255" d="M34.398 9.624c-1.02-1.582-5.397-7.694-5.585-7.957-.188-.261-.491-.417-.813-.417-1.459 0-4.763-.016-7.233-.028-1.481-.007-2.663-.013-2.975-.013-.648 0-1.18.425-1.324 1.059-.336 1.48 1.528 4.291 7.892 7.343 4.216 2.021 6.661 2.446 7.97 2.446h.001c1.474 0 2.038-.551 2.252-1.013.214-.466.144-.991-.185-1.42z"/><path fill="#5C913B" d="M26.141 10.411c3.136 1.328 5.078 1.645 6.188 1.645h.001c1.474 0 2.038-.551 2.252-1.013.215-.465.146-.99-.184-1.419-.653-1.013-2.681-3.881-4.106-5.884.812 2.577 1.111 6.467-4.151 6.671z"/><circle fill="#3E721D" cx="28.188" cy="1.688" r="1.688"/></svg> \ No newline at end of file |