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/1f490.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/1f490.svg')
-rw-r--r-- | public/emoji/1f490.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f490.svg b/public/emoji/1f490.svg index 79b996eed..f080ef7f1 100644 --- a/public/emoji/1f490.svg +++ b/public/emoji/1f490.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(35.0098,5.0332)" id="g20"><path id="path22" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.385,2.226 -3.34,5.001 -5.265,7.888 -5.14,8.772 -1.512,18.411 -2.892,21.51 -0.56,1.26 -3.879,-0.966 -5.555,-4.563 -0.356,0.106 -0.747,0.157 -1.17,0.148 0.155,2.398 0.293,4.31 -0.193,5.404 -0.71,1.598 -5.867,-2.419 -6.464,-7.73 -1.847,-1.006 -3.222,-1.956 -3.222,-1.956 0,0 -0.95,-1.376 -1.954,-3.223 -5.312,-0.594 -9.331,-5.753 -7.732,-6.464 1.096,-0.489 3.014,-0.349 5.421,-0.193 -0.006,-0.42 0.046,-0.806 0.153,-1.159 -3.609,-1.674 -5.848,-5.006 -4.586,-5.567 3.282,-1.46 13.9,2.701 23.053,-3.893 0.288,-0.207 0.478,-0.322 0.6,-0.371 2.118,-1.433 4.114,-2.801 5.791,-3.846 2.875,-1.79 3.962,0.007 3.962,0.007 0,0 1.844,1.132 0.053,4.008"/></g><g transform="translate(35.0293,1.1719)" id="g24"><path id="path26" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.369,0.545 0.338,1.278 -0.144,1.761 0,0 -11.86,15.812 -13.835,23.719 -1.977,7.906 -4.397,5.737 -3.689,-0.474 0.325,-2.848 1.817,-6.139 3.806,-9.385 l -8.942,8.941 c -0.546,0.546 -1.431,0.546 -1.977,0 -0.545,-0.546 -0.546,-1.431 0,-1.977 l 8.94,-8.94 c -3.245,1.987 -6.536,3.479 -9.383,3.804 -6.212,0.709 -8.381,-1.712 -0.475,-3.688 7.908,-1.976 23.72,-13.836 23.72,-13.836 0.481,-0.483 1.214,-0.513 1.757,-0.146 0.035,-0.007 0.065,-0.009 0.078,0.004 0.026,0.026 0.035,0.06 0.058,0.086 0.025,0.023 0.059,0.031 0.083,0.056 C 0.011,-0.062 0.007,-0.031 0,0"/></g><g transform="translate(13.7715,29.1289)" id="g28"><path id="path30" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.807,-1.806 1.721,-4.819 -0.188,-6.73 -1.911,-1.909 -3.771,-0.841 -5.578,0.965 -1.805,1.805 -2.873,3.666 -0.963,5.577 C -4.819,1.721 -1.806,1.806 0,0"/></g><g transform="translate(12.6182,27.9756)" id="g32"><path id="path34" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.807,-1.807 2.875,-3.666 0.965,-5.576 -1.91,-1.91 -4.924,-1.995 -6.73,-0.189 -1.806,1.806 -0.964,5.577 -0.902,7.82 C -6.592,4.683 -2.18,2.181 0,0"/></g><g transform="translate(22.665,20.2344)" id="g36"><path id="path38" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.808,-1.807 1.722,-4.819 -0.187,-6.73 -1.911,-1.91 -3.77,-0.841 -5.577,0.964 -1.805,1.806 -2.874,3.667 -0.964,5.577 C -4.818,1.721 -1.804,1.806 0,0"/></g><g transform="translate(21.5137,19.0811)" id="g40"><path id="path42" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.806,-1.807 2.873,-3.666 0.964,-5.576 -0.946,-7.486 -3.96,-7.571 -5.765,-5.764 -7.571,-3.958 -6.73,-0.189 -6.667,2.055 -6.592,4.683 -2.181,2.18 0,0"/></g><g transform="translate(11.2026,19.8896)" id="g44"><path id="path46" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.369,-1.052 3.327,-3.876 2.139,-6.308 0.952,-8.741 -1.215,-8.393 -3.583,-7.341 -5.953,-6.289 -7.628,-4.934 -6.44,-2.499 -5.253,-0.067 -2.37,1.052 0,0"/></g><g transform="translate(10.4863,18.4219)" id="g48"><path id="path50" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2.368,-1.052 4.044,-2.408 2.855,-4.84 -1.186,-2.433 -4.071,-3.553 -6.439,-2.501 -2.37,1.051 -2.857,4.84 -3.57,6.943 C -7.991,2.065 -2.86,1.268 0,0"/></g><g transform="translate(24.9297,28.9883)" id="g52"><path id="path54" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.143,-2.447 0.082,-5.359 -2.365,-6.5 -2.447,-1.14 -3.881,0.607 -5.023,3.056 -1.142,2.448 -1.56,4.671 0.887,5.812 C -4.053,3.509 -1.143,2.45 0,0"/></g><g transform="translate(23.4531,28.2998)" id="g56"><path id="path58" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.141,-2.449 1.559,-4.671 -0.889,-5.812 -2.446,-1.14 -5.358,-0.081 -6.5,2.368 C -8.53,-0.996 -6.5,2.368 -5.713,4.534 -4.789,7.073 -1.38,2.956 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#3E721D" d="M35.01 30.967c-1.385-2.226-3.34-5.001-5.265-7.888-5.141-8.772-1.513-18.411-2.893-21.511-.56-1.259-3.879.966-5.555 4.563-.356-.106-.747-.156-1.17-.148.155-2.397.293-4.31-.193-5.403-.71-1.599-5.867 2.418-6.463 7.729-1.848 1.006-3.223 1.957-3.223 1.957s-.95 1.375-1.954 3.223c-5.312.594-9.331 5.753-7.732 6.464 1.097.488 3.015.349 5.421.192-.006.42.046.807.154 1.159-3.61 1.674-5.848 5.006-4.586 5.567 3.282 1.46 13.9-2.701 23.053 3.892.288.207.479.322.601.371 2.117 1.433 4.113 2.801 5.791 3.846 2.875 1.79 3.962-.007 3.962-.007s1.843-1.13.052-4.006z"/><path fill="#77B255" d="M35.029 34.828c.369-.545.338-1.278-.144-1.761 0 0-11.86-15.812-13.836-23.719-1.977-7.906-4.397-5.737-3.689.474.325 2.848 1.817 6.14 3.806 9.385l-8.941-8.941c-.546-.546-1.431-.546-1.977 0-.545.546-.546 1.431 0 1.977l8.94 8.941c-3.246-1.987-6.536-3.48-9.383-3.805-6.211-.709-8.381 1.712-.475 3.688 7.907 1.976 23.719 13.836 23.719 13.836.481.482 1.215.513 1.758.146.034.007.065.01.078-.004.025-.025.034-.059.058-.086.025-.022.059-.031.083-.056.014-.013.01-.044.003-.075z"/><path fill="#DD2E44" d="M13.771 6.871c1.807 1.806 1.721 4.819-.188 6.73-1.91 1.91-3.771.842-5.577-.964S5.132 8.97 7.042 7.06c1.91-1.91 4.924-1.995 6.729-.189z"/><path fill="#EA596E" d="M12.618 8.024c1.807 1.807 2.874 3.666.965 5.576-1.91 1.91-4.923 1.995-6.729.188-1.806-1.806-.964-5.576-.902-7.82.074-2.627 4.487-.124 6.666 2.056z"/><path fill="#DD2E44" d="M22.665 15.766c1.808 1.807 1.722 4.819-.188 6.729-1.91 1.91-3.77.842-5.576-.964-1.806-1.806-2.874-3.667-.964-5.577 1.91-1.91 4.924-1.994 6.728-.188z"/><path fill="#EA596E" d="M21.514 16.919c1.806 1.807 2.873 3.666.964 5.576-1.91 1.91-4.923 1.995-6.729.188-1.806-1.806-.964-5.575-.901-7.819.073-2.628 4.485-.125 6.666 2.055z"/><path fill="#F4900C" d="M11.203 16.11c2.369 1.052 3.327 3.876 2.139 6.308-1.187 2.434-3.354 2.085-5.723 1.033-2.37-1.052-4.045-2.407-2.857-4.841 1.188-2.432 4.071-3.551 6.441-2.5z"/><path fill="#FFCC4D" d="M10.486 17.578c2.368 1.052 4.043 2.408 2.855 4.84-1.187 2.434-4.071 3.553-6.439 2.501-2.37-1.051-2.857-4.84-3.57-6.943-.836-2.463 4.294-1.666 7.154-.398z"/><path fill="#F4900C" d="M24.93 7.012c1.143 2.447.082 5.359-2.365 6.5-2.446 1.14-3.88-.607-5.023-3.056-1.142-2.449-1.56-4.671.887-5.813 2.448-1.141 5.358-.081 6.501 2.369z"/><path fill="#FFCC4D" d="M23.453 7.7c1.141 2.449 1.559 4.671-.889 5.812-2.446 1.14-5.359.081-6.501-2.368-1.141-2.448.889-5.812 1.676-7.977.925-2.54 4.334 1.578 5.714 4.533z"/></svg> \ No newline at end of file |