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/1f428.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/1f428.svg')
-rw-r--r-- | public/emoji/1f428.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f428.svg b/public/emoji/1f428.svg index 9a54a0d28..1da7190a6 100644 --- a/public/emoji/1f428.svg +++ b/public/emoji/1f428.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(36,22.4668)" id="g20"><path id="path22" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,4.667 -3.134,6.533 -7,6.533 -1.621,0 -3.285,-0.354 -4.676,-1.027 -1.801,1.229 -3.919,1.965 -6.324,1.965 -2.405,0 -4.523,-0.736 -6.324,-1.965 -1.391,0.673 -3.055,1.027 -4.676,1.027 -3.866,0 -7,-1.866 -7,-6.533 0,-3.844 2.128,-6.417 5.038,-7.206 -0.043,-0.536 -0.068,-1.073 -0.068,-1.611 0,-5.729 4.519,-7.675 8.581,-8.327 1.098,-0.81 2.681,-1.323 4.449,-1.323 1.768,0 3.351,0.513 4.449,1.323 4.062,0.652 8.581,2.597 8.581,8.327 0,0.538 -0.025,1.075 -0.068,1.611 C -2.128,-6.417 0,-3.844 0,0"/></g><g transform="translate(9.5542,26.146)" id="g24"><path id="path26" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.318,0.033 -0.637,0.054 -0.954,0.054 -3.093,0 -5.6,-1.493 -5.6,-5.226 0,-2.155 0.838,-3.808 2.138,-4.825 C -3.943,-6.199 -2.412,-2.58 0,0"/></g><g transform="translate(27.4004,26.2002)" id="g28"><path id="path30" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.317,0 -0.637,-0.021 -0.955,-0.054 1.457,-2.634 2.988,-6.253 3.461,-10.051 4.762,-9.034 5.6,-7.381 5.6,-5.227 5.6,-1.494 3.093,0 0,0"/></g><g transform="translate(21.7275,11.1934)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.346 -1.728,-4.193 -3.728,-4.193 -2,0 -3.727,0.847 -3.727,4.193 0,3.345 1.727,6.057 3.727,6.057 C -1.728,6.057 0,3.345 0,0"/></g><g transform="translate(14,16.125)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.828 -0.671,-1.5 -1.5,-1.5 -2.329,-1.5 -3,-0.828 -3,0 -3,0.828 -2.329,1.5 -1.5,1.5 -0.671,1.5 0,0.828 0,0"/></g><g transform="translate(25,16.125)" id="g40"><path id="path42" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.828 -0.672,-1.5 -1.5,-1.5 -2.328,-1.5 -3,-0.828 -3,0 -3,0.828 -2.328,1.5 -1.5,1.5 -0.672,1.5 0,0.828 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#99AAB5" d="M36 13.533C36 8.867 32.866 7 29 7c-1.621 0-3.285.354-4.676 1.027C22.523 6.798 20.405 6.062 18 6.062s-4.523.736-6.324 1.965C10.285 7.354 8.621 7 7 7c-3.866 0-7 1.867-7 6.533 0 3.844 2.128 6.417 5.038 7.206-.043.536-.068 1.073-.068 1.611 0 5.729 4.52 7.675 8.581 8.326C14.649 31.487 16.232 32 18 32s3.351-.513 4.449-1.323c4.062-.651 8.581-2.597 8.581-8.326 0-.538-.025-1.075-.068-1.611 2.91-.79 5.038-3.363 5.038-7.207z"/><path fill="#66757F" d="M9.554 9.854C9.236 9.821 8.917 9.8 8.6 9.8 5.507 9.8 3 11.293 3 15.026c0 2.154.838 3.808 2.138 4.824.473-3.797 2.005-7.416 4.416-9.996zM27.4 9.8c-.317 0-.637.021-.955.054 2.412 2.58 3.943 6.199 4.416 9.997C32.162 18.834 33 17.181 33 15.026c0-3.733-2.507-5.226-5.6-5.226z"/><path fill="#292F33" d="M21.728 24.807C21.728 28.152 20 29 18 29s-3.727-.848-3.727-4.193c0-3.345 1.727-6.057 3.727-6.057s3.728 2.712 3.728 6.057z"/><circle fill="#292F33" cx="12.5" cy="19.875" r="1.5"/><circle fill="#292F33" cx="23.5" cy="19.875" r="1.5"/></svg> \ No newline at end of file |