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/1f354.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/1f354.svg')
-rw-r--r-- | public/emoji/1f354.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f354.svg b/public/emoji/1f354.svg index 7c954be89..a129dccb3 100644 --- a/public/emoji/1f354.svg +++ b/public/emoji/1f354.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(18,15.5889)" id="g20"><path id="path22" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -9.371,0 -16.967,0.225 -16.967,-6.427 0,-6.649 7.596,-8.162 16.967,-8.162 9.371,0 16.967,1.513 16.967,8.162 C 16.967,0.225 9.371,0 0,0"/></g><g transform="translate(34.4702,15.0837)" id="g24"><path id="path26" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -8.219,0.984 -16.47,1.026 -24.721,0.984 -32.94,0 -32.94,0 -33.753,-6.474 -27.003,-9.141 -16.47,-9.141 -5.937,-9.141 0.812,-6.474 0,0"/></g><g transform="translate(33.8857,17.6724)" id="g28"><path id="path30" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -31.855,-0.646 c -1.1,0 -2.021,-2.229 -0.854,-2.812 8.708,-2.709 15.708,-5.449 15.708,-5.449 0.963,-0.532 1.287,-0.534 2.251,-0.003 0,0 9.666,3.868 15.875,5.493 C 2.005,-3.186 1.1,0 0,0"/></g><g transform="translate(34.7251,17.5878)" id="g32"><path id="path34" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.9,1.751 -1.79,0.819 -3.246,1.23 -0.553,0.156 -4.509,5.272 -13.528,5.272 -0.004,0 -0.007,-10e-4 -0.01,-10e-4 -0.004,0 -0.007,10e-4 -0.01,10e-4 -9.02,0 -12.976,-5.116 -13.529,-5.272 -1.456,-0.411 -1.346,0.521 -3.246,-1.23 -0.872,-0.804 -1.108,-1.222 -0.188,-1.43 1.386,-0.314 1.26,-1.152 2.253,-1.444 1.202,-0.353 1.696,0.292 3.635,0.028 1.653,-0.224 1.76,-2.369 3.428,-2.369 1.668,0 1.668,0.8 3.336,0.8 1.667,0 2.653,-2.146 4.321,-2.146 1.667,0 2.653,2.146 4.32,2.146 1.668,0 1.668,-0.8 3.336,-0.8 1.668,0 1.776,2.145 3.429,2.369 1.938,0.264 2.433,-0.381 3.634,-0.028 0.993,0.292 0.867,1.13 2.253,1.444 C 1.108,-1.222 0.872,-0.804 0,0"/></g><g transform="translate(34.077,19.4796)" id="g36"><path id="path38" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.984 -7.198,-4.393 -16.077,-4.393 -8.879,0 -16.077,1.409 -16.077,4.393 0,5.403 0.966,5.403 16.077,5.403 C -0.966,5.403 0,5.403 0,0"/></g><g transform="translate(18,35.4764)" id="g40"><path id="path42" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -9.371,0 -16.967,-4.391 -16.967,-11.042 0,-6.125 7.596,-6.375 16.967,-6.375 9.371,0 16.967,0.25 16.967,6.375 C 16.967,-4.391 9.371,0 0,0"/></g><g transform="translate(10.7842,32.3053)" id="g44"><path id="path46" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.498,0.318 -1.159,0.172 -1.478,-0.326 -1.795,-0.823 -1.65,-1.485 -1.152,-1.802 -0.654,-2.121 0.608,-2.359 0.927,-1.861 1.245,-1.363 0.498,-0.318 0,0"/></g><g transform="translate(20.5176,33.34)" id="g48"><path id="path50" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.562,-0.182 -1.549,-1.006 -1.366,-1.568 -1.184,-2.13 0.098,-2.217 0.66,-2.034 1.223,-1.852 1.529,-1.248 1.347,-0.686 1.164,-0.125 0.56,0.183 0,0"/></g><g transform="translate(31.4267,26.3053)" id="g52"><path id="path54" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.452,0.38 -1.585,-0.225 -1.966,-0.677 -0.38,-0.453 -0.321,-1.127 0.131,-1.508 0.452,-0.38 1.127,-0.321 1.507,0.132 C 0.053,-1.601 0.453,-0.38 0,0"/></g><g transform="translate(27.7842,31.3053)" id="g56"><path id="path58" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.498,0.318 -1.159,0.172 -1.478,-0.326 -1.796,-0.823 -1.65,-1.485 -1.151,-1.802 -0.653,-2.121 0.608,-2.359 0.927,-1.861 1.245,-1.363 0.498,-0.318 0,0"/></g><g transform="translate(12.7842,24.3053)" id="g60"><path id="path62" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.498,0.318 -1.159,0.172 -1.478,-0.326 -1.796,-0.823 -1.65,-1.485 -1.151,-1.802 -0.653,-2.121 0.608,-2.359 0.927,-1.86 1.245,-1.363 0.498,-0.318 0,0"/></g><g transform="translate(15.8301,29.1129)" id="g64"><path id="path66" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.336,-0.486 -0.62,-1.739 -0.133,-2.075 0.486,-0.336 1.557,0.374 1.893,0.86 0.336,0.486 0.214,1.152 -0.273,1.488 C 1.001,0.609 0.335,0.486 0,0"/></g><g transform="translate(23.7842,24.3053)" id="g68"><path id="path70" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.498,0.318 -1.159,0.172 -1.478,-0.326 -1.796,-0.823 -1.65,-1.485 -1.151,-1.802 -0.653,-2.121 0.608,-2.359 0.927,-1.86 1.245,-1.363 0.498,-0.318 0,0"/></g><g transform="translate(4.9482,28.1916)" id="g72"><path id="path74" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.395,-0.44 -0.833,-1.648 -0.392,-2.042 0.047,-2.436 1.199,-1.867 1.593,-1.427 1.988,-0.986 1.95,-0.311 1.51,0.084 1.07,0.478 0.394,0.44 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#D99E82" d="M18 20.411c-9.371 0-16.967-.225-16.967 6.427C1.033 33.487 8.629 35 18 35c9.371 0 16.967-1.513 16.967-8.162 0-6.651-7.596-6.427-16.967-6.427z"/><path fill="#662113" d="M34.47 20.916S26.251 19.932 18 19.89c-8.251.042-16.47 1.026-16.47 1.026C.717 27.39 7.467 30.057 18 30.057s17.283-2.667 16.47-9.141z"/><path fill="#FFCC4D" d="M33.886 18.328l-31.855.646c-1.1 0-2.021 2.229-.854 2.812 8.708 2.708 15.708 5.448 15.708 5.448.962.532 1.287.534 2.25.003 0 0 9.666-3.868 15.875-5.493.881-.23-.025-3.416-1.124-3.416z"/><path fill="#77B255" d="M34.725 18.412c-1.9-1.751-1.79-.819-3.246-1.23-.553-.156-4.51-5.271-13.529-5.271h-.02c-9.019 0-12.976 5.115-13.529 5.271-1.456.411-1.346-.521-3.246 1.23-.872.804-1.108 1.222-.188 1.43 1.386.313 1.26 1.152 2.253 1.444 1.202.353 1.696-.292 3.634-.028 1.653.225 1.761 2.369 3.429 2.369s1.668-.8 3.335-.8 2.653 2.146 4.321 2.146 2.653-2.146 4.321-2.146c1.668 0 1.668.8 3.335.8 1.668 0 1.776-2.144 3.429-2.369 1.938-.263 2.433.381 3.634.028.993-.292.867-1.13 2.253-1.444.922-.207.687-.626-.186-1.43z"/><path fill="#DD2E44" d="M34.077 16.52c0 2.984-7.198 4.393-16.077 4.393S1.923 19.504 1.923 16.52c0-5.403.966-5.403 16.077-5.403s16.077.001 16.077 5.403z"/><path fill="#D99E82" d="M18 .524C8.629.524 1.033 4.915 1.033 11.566c0 6.125 7.596 6.375 16.967 6.375s16.967-.25 16.967-6.375C34.967 4.914 27.371.524 18 .524z"/><path d="M10.784 3.695c-.498-.319-1.159-.173-1.477.325-.318.498-.173 1.16.325 1.477.498.319 1.76.557 2.079.059.318-.498-.429-1.543-.927-1.861zm9.734-1.035c-.562.182-1.549 1.006-1.366 1.568.183.562 1.464.648 2.026.466s.869-.786.686-1.348c-.182-.561-.786-.869-1.346-.686zm10.909 7.035c-.452-.38-1.585.225-1.966.677-.38.453-.321 1.127.131 1.507.452.38 1.127.321 1.507-.131.381-.453.781-1.673.328-2.053zm-3.643-5c-.498-.318-1.159-.172-1.478.326-.318.498-.172 1.159.326 1.477.498.319 1.76.557 2.078.059.319-.499-.428-1.544-.926-1.862zm-15 7c-.498-.318-1.159-.172-1.478.326-.318.497-.172 1.159.326 1.476.498.319 1.76.558 2.078.059.319-.498-.428-1.543-.926-1.861zm3.046-4.808c-.336.486-.62 1.739-.133 2.075.486.336 1.557-.374 1.893-.86.336-.486.213-1.152-.273-1.488-.485-.336-1.152-.213-1.487.273zm7.954 4.808c-.498-.318-1.159-.172-1.478.326-.318.497-.172 1.16.326 1.476.498.319 1.76.558 2.078.059.319-.498-.428-1.543-.926-1.861zM4.948 7.808c-.394.441-.833 1.648-.392 2.042.439.394 1.591-.174 1.985-.615.395-.44.357-1.116-.083-1.511-.439-.394-1.116-.356-1.51.084z" fill="#FFE8B6"/></svg> \ No newline at end of file |