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/1f64c.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/1f64c.svg')
-rw-r--r-- | public/emoji/1f64c.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f64c.svg b/public/emoji/1f64c.svg index 4ff308a9d..be95511f9 100644 --- a/public/emoji/1f64c.svg +++ b/public/emoji/1f64c.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></defs><g transform="matrix(1.25,0,0,-1.25,0,45)" id="g10"><path id="path12" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 3,0 11,0 11,10 3,10 3,0 Z"/><path id="path14" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 25,0 8,0 0,10 -8,0 0,-10 z"/><g id="g16"><g clip-path="url(#clipPath20)" id="g18"><g transform="translate(33,7.2803)" id="g24"><path id="path26" style="fill:#f9ca55;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -3,-2 -8,-1 L -8,4 0,4 0,0 Z"/></g><g transform="translate(3,7.2803)" id="g28"><path id="path30" style="fill:#f9ca55;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 3,-2 8,-1 L 8,4 0,4 0,0 Z"/></g><path id="path32" style="fill:#ef9645;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 12,10 -8,0 0,8 8,0 0,-8 z"/><path id="path34" style="fill:#ef9645;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 32,10 -8,0 0,8 8,0 0,-8 z"/><g transform="translate(0.3726,24.1646)" id="g36"><path id="path38" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0.003,1.225 1.227,1.222 2.453,1.218 2.449,-0.007 2.449,-0.007 L 2.431,-5.691 c 0.194,0.09 0.399,0.171 0.612,0.241 l 0.025,7.889 c 0,0 0.005,1.225 1.227,1.221 C 5.52,3.657 5.517,2.431 5.517,2.431 l -0.022,-7.42 c 0.199,0.017 0.404,0.032 0.61,0.041 l 0.028,8.602 c 0,0 0.003,1.225 1.228,1.221 C 8.586,4.87 8.581,3.646 8.581,3.646 L 8.553,-4.955 c 0.21,-0.011 0.411,-0.033 0.614,-0.051 l 0.025,8.038 c 0,0 0.005,1.225 1.227,1.22 1.225,-0.003 1.219,-1.227 1.219,-1.227 l -0.024,-8.501 -0.003,-0.681 0,-0.611 c -3.674,0.009 -6.133,-3.042 -6.144,-6.104 0,-0.612 0.612,-0.616 0.612,-0.616 0.01,3.678 2.467,6.115 6.142,6.105 l 1.8,4.188 c 0,0 0.395,1.158 1.556,0.762 1.158,-0.392 0.765,-1.553 0.765,-1.553 L 15.449,-7.09 c -0.354,-1.235 -0.684,-2.477 -0.859,-3.745 -0.498,-3.584 -3.58,-6.339 -7.299,-6.33 -4.055,0.017 -7.335,3.315 -7.322,7.371 0.001,0.213 0.014,0.418 0.034,0.61 L -0.029,-9.18 0,0 Z"/></g><g transform="translate(35.6172,24.1646)" id="g40"><path id="path42" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -0.003,1.225 -1.227,1.222 -2.453,1.218 -2.449,-0.007 -2.449,-0.007 l 0.018,-5.684 c -0.194,0.09 -0.399,0.171 -0.612,0.241 l -0.025,7.889 c 0,0 -0.004,1.225 -1.227,1.221 C -5.52,3.657 -5.517,2.431 -5.517,2.431 l 0.022,-7.42 c -0.198,0.017 -0.403,0.032 -0.61,0.041 l -0.028,8.602 c 0,0 -0.004,1.225 -1.228,1.221 -1.225,-0.005 -1.22,-1.229 -1.22,-1.229 l 0.028,-8.601 c -0.21,-0.011 -0.412,-0.033 -0.614,-0.051 l -0.025,8.038 c 0,0 -0.005,1.225 -1.228,1.22 -1.224,-0.003 -1.219,-1.227 -1.219,-1.227 l 0.025,-8.501 0.003,-0.681 0,-0.611 c 3.674,0.009 6.132,-3.042 6.144,-6.104 0,-0.612 -0.612,-0.616 -0.612,-0.616 -0.011,3.678 -2.468,6.115 -6.142,6.105 l -1.8,4.188 c 0,0 -0.395,1.158 -1.556,0.762 -1.157,-0.392 -0.765,-1.553 -0.765,-1.553 l 0.893,-3.104 c 0.353,-1.235 0.684,-2.477 0.859,-3.745 0.498,-3.584 3.58,-6.339 7.299,-6.33 4.055,0.017 7.336,3.315 7.322,7.371 -0.001,0.213 -0.013,0.418 -0.034,0.61 L 0.029,-9.18 0,0 Z"/></g><g transform="translate(23.541,29.5415)" id="g44"><path id="path46" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.213,0 -0.429,0.068 -0.61,0.208 -1.048,0.546 -1.128,1.174 -0.79,1.611 L 2.189,5.466 C 2.523,5.902 3.153,5.986 3.591,5.646 4.028,5.309 4.108,4.681 3.771,4.244 L 0.792,0.389 C 0.596,0.134 0.3,0 0,0"/></g><g transform="translate(12.521,29.5415)" id="g48"><path id="path50" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.299,0 -0.595,0.134 -0.792,0.389 l -2.979,3.855 c -0.337,0.437 -0.256,1.065 0.181,1.402 0.437,0.337 1.064,0.258 1.402,-0.18 L 0.791,1.611 C 1.128,1.174 1.048,0.546 0.611,0.208 0.429,0.068 0.214,0 0,0"/></g><g transform="translate(18,30)" id="g52"><path id="path54" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -1,1 l 0,4 C -1,5.552 -0.552,6 0,6 0.553,6 1,5.552 1,5 L 1,1 C 1,0.448 0.553,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFDC5D" d="M3 26h8v10H3zm22 0h8v10h-8z"/><path fill="#F9CA55" d="M33 28.72s-3 2-8 1v-5h8v4zm-30 0s3 2 8 1v-5H3v4z"/><path fill="#EF9645" d="M3.983 18.604h8v8h-8zm20.023-.5h8v8h-8z"/><path fill="#FFDC5D" d="M.373 11.835S.376 10.61 1.6 10.613c1.226.004 1.222 1.229 1.222 1.229l-.019 5.684c.195-.09.399-.171.613-.241l.025-7.889s.004-1.225 1.227-1.221c1.224.003 1.221 1.229 1.221 1.229l-.021 7.42c.199-.018.404-.032.61-.042l.028-8.602s.003-1.225 1.228-1.22c1.225.004 1.22 1.229 1.22 1.229l-.028 8.6c.21.012.412.033.614.052l.025-8.039s.004-1.225 1.227-1.22c1.224.003 1.219 1.227 1.219 1.227l-.024 8.501-.003.681v.611c-3.674-.009-6.133 3.042-6.144 6.104 0 .612.612.616.612.616.01-3.678 2.467-6.115 6.142-6.104l1.801-4.188s.395-1.159 1.556-.762c1.158.392.765 1.553.765 1.553l-.893 3.105c-.354 1.234-.685 2.476-.859 3.744-.498 3.584-3.581 6.34-7.299 6.33C3.61 28.983.33 25.685.343 21.63c.001-.214.014-.418.034-.61l-.032-.004.028-9.181zm35.244 0s-.003-1.225-1.227-1.222c-1.226.004-1.223 1.229-1.223 1.229l.019 5.684c-.194-.09-.399-.171-.612-.241l-.025-7.889s-.004-1.225-1.227-1.221c-1.225.003-1.222 1.229-1.222 1.229l.022 7.42c-.198-.018-.403-.032-.61-.042l-.027-8.602s-.004-1.225-1.229-1.22c-1.225.004-1.22 1.229-1.22 1.229l.028 8.6c-.21.012-.412.033-.614.052l-.025-8.039s-.005-1.225-1.228-1.22c-1.224.003-1.219 1.227-1.219 1.227l.024 8.501.003.681v.611c3.674-.009 6.133 3.042 6.145 6.104 0 .612-.612.616-.612.616-.011-3.678-2.468-6.115-6.142-6.104l-1.801-4.188s-.394-1.159-1.556-.762c-1.157.392-.765 1.553-.765 1.553l.893 3.105c.354 1.234.685 2.476.859 3.744.498 3.584 3.58 6.34 7.299 6.33 4.055-.017 7.336-3.315 7.322-7.37-.001-.214-.014-.418-.034-.61l.032-.004-.028-9.181z"/><path d="M23.541 6.458c-.213 0-.429-.068-.61-.208-.438-.338-.518-.966-.18-1.403L25.73.992c.335-.436.965-.52 1.402-.18.438.338.518.966.18 1.403L24.333 6.07c-.196.255-.492.388-.792.388zm-11.02 0c-.299 0-.595-.134-.792-.389L8.75 2.215c-.337-.437-.256-1.065.181-1.403.437-.337 1.064-.257 1.403.18l2.979 3.855c.337.437.257 1.065-.18 1.403-.183.141-.398.208-.612.208zM18 6c-.552 0-1-.448-1-1V1c0-.552.448-1 1-1 .553 0 1 .448 1 1v4c0 .552-.447 1-1 1z" fill="#5DADEC"/></svg> \ No newline at end of file |