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/1f91c-1f3fb.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/1f91c-1f3fb.svg')
| -rw-r--r-- | public/emoji/1f91c-1f3fb.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f91c-1f3fb.svg b/public/emoji/1f91c-1f3fb.svg index 3207b4b58..ff817fd7b 100644 --- a/public/emoji/1f91c-1f3fb.svg +++ b/public/emoji/1f91c-1f3fb.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(27.7184,29.8175)" id="g20"><path id="path22" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.217,-0.844 -10.943,-3.114 -12.782,-3.907 -4.245,-1.829 -7.507,-5.306 -7.448,-9.205 0.064,-4.22 1.768,-6.944 7.888,-8.048 6.201,-1.119 10.241,-1.437 12.626,-1.79 3.452,-0.512 4.322,4.595 0.671,5.05 0,0 3.171,0.447 5.122,0.664 2.301,0.256 2.475,2.106 1.975,4.578 C 7.54,-10.133 5.757,-5.761 4.859,-3.516 3.715,-0.658 2.557,0.671 0,0"/></g><g transform="translate(30.9823,8.9057)" id="g24"><path id="path26" style="fill:#e0aa94;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.301,2.733 -2.365,3.005 -1.567,0.159 -3.676,0.418 -4.475,0.511 -1.375,0.16 -1.663,1.343 -1.311,2.365 0.347,1.009 2.493,6.297 3.005,7.64 0.38,0.997 1.364,0.659 1.726,-0.064 0.669,-1.337 1.828,-3.845 1.982,-4.251 0.349,-0.925 -0.736,-1.566 -1.247,-0.64 -0.346,0.628 -1.63,3.644 -1.63,3.644 0,0 -2.398,-5.785 -2.653,-6.52 C -7.191,5.049 -6.904,4.667 -6.265,4.571 -5.626,4.475 -2.78,4.13 -1.918,3.996 -0.479,3.772 0.607,2.333 0,0"/></g><g transform="translate(28.4251,18.3992)" id="g28"><path id="path30" style="fill:#e0aa94;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -1.023,-0.448 -1.822,-0.735 -0.799,-0.288 -0.511,-1.407 0.32,-1.183 0.831,0.224 2.173,0.575 2.173,0.575 L 0,0 Z"/></g><g transform="translate(31.9412,26.5501)" id="g32"><path id="path34" style="fill:#e0aa94;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.389,0.829 -1.311,0.352 -1.087,-0.32 -0.863,-0.991 2.525,-9.078 2.845,-9.909 3.164,-10.74 3.676,-10.548 3.42,-9.685 3.164,-8.822 0.479,-1.023 0,0"/></g><g transform="translate(26.6671,21.1161)" id="g36"><path id="path38" style="fill:#e0aa94;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.391,-1.397 -0.054,-3.091 -0.441,-3.834 L 1.995,-2.942 0,0 Z"/></g><g transform="translate(14.8624,25.8416)" id="g40"><path id="path42" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.218,-1.04 -7.684,-1.139 -11.595,-0.772 -2.02,0.189 -3.267,0.198 -3.267,-1.436 l 0,-10.604 c 0,-1.99 0.728,-1.969 2.871,-1.683 3.268,0.436 5.129,1.228 8.248,-1.347 C -1.566,-17.638 6.057,1.957 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F7DECE" d="M27.718 6.183c-3.217.844-10.943 3.114-12.782 3.907-4.244 1.829-7.507 5.306-7.448 9.206.064 4.219 1.768 6.944 7.888 8.048 6.201 1.119 10.241 1.437 12.626 1.79 3.452.511 4.322-4.596.671-5.05 0 0 3.171-.447 5.121-.664 2.301-.256 2.475-2.106 1.975-4.578-.511-2.525-2.294-6.897-3.193-9.142-1.143-2.859-2.3-4.189-4.858-3.517z"/><path fill="#E0AA94" d="M30.982 27.094s.301-2.733-2.365-3.005c-1.566-.16-3.676-.418-4.475-.511-1.374-.16-1.662-1.343-1.311-2.365.347-1.009 2.493-6.297 3.005-7.64.38-.997 1.364-.659 1.726.064.669 1.337 1.828 3.845 1.982 4.251.349.924-.735 1.566-1.247.639-.346-.627-1.63-3.644-1.63-3.644s-2.397 5.786-2.653 6.521c-.223.64.064 1.023.703 1.119.639.096 3.485.441 4.347.575 1.439.224 2.526 1.663 1.918 3.996z"/><path fill="#E0AA94" d="M28.425 17.601s-1.023.448-1.822.735c-.799.288-.511 1.406.32 1.183.831-.224 2.174-.575 2.174-.575l-.672-1.343zm3.516-8.151c-.389-.829-1.311-.352-1.087.32.224.671 3.612 8.758 3.932 9.589s.831.639.575-.224c-.255-.863-2.94-8.662-3.42-9.685z"/><path fill="#E0AA94" d="M26.667 14.884c.391 1.397-.054 3.091-.441 3.834l2.436-.891-1.995-2.943z"/><path fill="#F7DECE" d="M14.862 10.158c-3.218 1.04-7.684 1.139-11.595.772C1.247 10.741 0 10.733 0 12.366V22.97c0 1.99.728 1.969 2.872 1.683 3.267-.435 5.129-1.227 8.248 1.347 2.176 1.797 9.799-17.798 3.742-15.842z"/></svg> \ No newline at end of file |
