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/1f5d3.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/1f5d3.svg')
-rw-r--r-- | public/emoji/1f5d3.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f5d3.svg b/public/emoji/1f5d3.svg index cd3ce2757..526191c03 100644 --- a/public/emoji/1f5d3.svg +++ b/public/emoji/1f5d3.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="clipPath18" clipPathUnits="userSpaceOnUse"><path id="path20" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath30" clipPathUnits="userSpaceOnUse"><path id="path32" d="M 6,32 C 3.791,32 2,30.209 2,28 L 2,28 2,4 C 2,1.791 3.791,0 6,0 l 0,0 24,0 c 2.209,0 4,1.791 4,4 l 0,0 0,24 c 0,2.209 -1.791,4 -4,4 l 0,0 -24,0 z"/></clipPath><clipPath id="clipPath40" clipPathUnits="userSpaceOnUse"><path id="path42" 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:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 28.814,29.609 1.996,0 0,2.391 -1.996,0 0,-2.391 z"/><g id="g14"><g clip-path="url(#clipPath18)" id="g16"><g transform="translate(30,32)" id="g22"><path id="path24" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -24,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-24 c 0,-2.209 1.791,-4 4,-4 l 24,0 c 2.209,0 4,1.791 4,4 L 4,-4 C 4,-1.791 2.209,0 0,0"/></g></g></g><g id="g26"><g clip-path="url(#clipPath30)" id="g28"><path id="path34" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 34,23 -32,0 0,9 32,0 0,-9 z"/></g></g><g id="g36"><g clip-path="url(#clipPath40)" id="g38"><g transform="translate(8.8359,27.2695)" id="g44"><path id="path46" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.702,0 -1.271,0.666 -1.271,1.489 0,0.823 0.569,1.49 1.271,1.49 0.701,0 1.27,-0.667 1.27,-1.49 C 1.27,0.666 0.701,0 0,0"/></g><g transform="translate(9.543,28.917)" id="g48"><path id="path50" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.055,0.479 -0.374,0.792 -0.729,1.017 -0.485,0.306 -1,1.007 -1,1.876 0,1.105 0.671,2.095 1.5,2.095 0.83,0 1.5,-0.905 1.5,-1.905 l 1.997,0 c -0.021,2 -1.576,3.821 -3.497,3.821 -1.933,0 -3.5,-1.819 -3.5,-4.005 0,-1.853 1.045,-3.371 2.57,-3.925 C -0.4,-1.302 0.064,-0.579 0,0"/></g><g transform="translate(14.8359,27.2695)" id="g52"><path id="path54" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.702,0 -1.271,0.666 -1.271,1.489 0,0.823 0.569,1.49 1.271,1.49 0.701,0 1.27,-0.667 1.27,-1.49 C 1.27,0.666 0.701,0 0,0"/></g><g transform="translate(15.543,28.917)" id="g56"><path id="path58" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.055,0.479 -0.374,0.792 -0.729,1.017 -0.485,0.306 -1,1.007 -1,1.876 0,1.105 0.671,2.095 1.5,2.095 0.83,0 1.5,-0.905 1.5,-1.905 l 1.997,0 c -0.021,2 -1.576,3.821 -3.497,3.821 -1.933,0 -3.5,-1.819 -3.5,-4.005 0,-1.853 1.045,-3.371 2.57,-3.925 C -0.4,-1.302 0.064,-0.579 0,0"/></g><g transform="translate(20.8359,27.2695)" id="g60"><path id="path62" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.702,0 -1.271,0.666 -1.271,1.489 0,0.823 0.569,1.49 1.271,1.49 0.701,0 1.27,-0.667 1.27,-1.49 C 1.27,0.666 0.701,0 0,0"/></g><g transform="translate(21.543,28.917)" id="g64"><path id="path66" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.055,0.479 -0.374,0.792 -0.729,1.017 -0.485,0.306 -1,1.007 -1,1.876 0,1.105 0.671,2.095 1.5,2.095 0.83,0 1.5,-0.905 1.5,-1.905 l 1.997,0 c -0.021,2 -1.576,3.821 -3.497,3.821 -1.933,0 -3.5,-1.819 -3.5,-4.005 0,-1.853 1.045,-3.371 2.57,-3.925 C -0.4,-1.302 0.064,-0.579 0,0"/></g><g transform="translate(26.8359,27.2695)" id="g68"><path id="path70" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.702,0 -1.271,0.666 -1.271,1.489 0,0.823 0.569,1.49 1.271,1.49 0.701,0 1.27,-0.667 1.27,-1.49 C 1.27,0.666 0.701,0 0,0"/></g><g transform="translate(27.543,28.917)" id="g72"><path id="path74" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.055,0.479 -0.374,0.792 -0.729,1.017 -0.485,0.306 -1,1.007 -1,1.876 0,1.105 0.671,2.095 1.5,2.095 0.83,0 1.5,-0.905 1.5,-1.905 l 1.997,0 c -0.021,2 -1.576,3.821 -3.497,3.821 -1.933,0 -3.5,-1.819 -3.5,-4.005 0,-1.853 1.045,-3.371 2.57,-3.925 C -0.4,-1.302 0.064,-0.579 0,0"/></g><path id="path76" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 15,17 -4,0 0,4 4,0 0,-4 z"/><path id="path78" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 20,17 -4,0 0,4 4,0 0,-4 z"/><path id="path80" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 25,17 -4,0 0,4 4,0 0,-4 z"/><path id="path82" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 30,17 -4,0 0,4 4,0 0,-4 z"/><path id="path84" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 10,12 -4,0 0,4 4,0 0,-4 z"/><path id="path86" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 15,12 -4,0 0,4 4,0 0,-4 z"/><path id="path88" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 20,12 -4,0 0,4 4,0 0,-4 z"/><path id="path90" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 25,12 -4,0 0,4 4,0 0,-4 z"/><path id="path92" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 30,12 -4,0 0,4 4,0 0,-4 z"/><path id="path94" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 10,7 -4,0 0,4 4,0 0,-4 z"/><path id="path96" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 15,7 -4,0 0,4 4,0 0,-4 z"/><path id="path98" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 20,7 -4,0 0,4 4,0 0,-4 z"/><path id="path100" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 25,7 -4,0 0,4 4,0 0,-4 z"/><path id="path102" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 30,7 -4,0 0,4 4,0 0,-4 z"/><path id="path104" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 10,2 6,2 6,6 10,6 10,2 Z"/><path id="path106" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 15,2 -4,0 0,4 4,0 0,-4 z"/><path id="path108" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 20,2 -4,0 0,4 4,0 0,-4 z"/></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#66757F" d="M28.815 4h1.996v1h-1.996z"/><path fill="#CCD6DD" d="M2 12v20c0 2.209 1.791 4 4 4h24c2.209 0 4-1.791 4-4V12H2z"/><path fill="#DD2E44" d="M30 4H6C3.791 4 2 5.791 2 8v5h32V8c0-2.209-1.791-4-4-4z"/><path d="M8.836 8.731c-.702 0-1.271-.666-1.271-1.489 0-.822.569-1.489 1.271-1.489.701 0 1.27.667 1.27 1.489 0 .822-.569 1.489-1.27 1.489zm6 0c-.702 0-1.271-.666-1.271-1.489 0-.822.569-1.489 1.271-1.489.701 0 1.27.667 1.27 1.489 0 .822-.569 1.489-1.27 1.489zm6 0c-.702 0-1.271-.666-1.271-1.489 0-.822.569-1.489 1.271-1.489.701 0 1.271.667 1.271 1.489-.001.822-.57 1.489-1.271 1.489zm6 0c-.702 0-1.271-.666-1.271-1.489 0-.822.569-1.489 1.271-1.489.701 0 1.271.667 1.271 1.489-.001.822-.57 1.489-1.271 1.489z" fill="#292F33"/><path fill="#66757F" d="M27.315.179c-1.277 0-2.383.802-2.994 1.97-.606-1.143-1.717-1.97-3.006-1.97-1.277 0-2.383.802-2.994 1.97-.606-1.143-1.717-1.97-3.006-1.97-1.277 0-2.383.802-2.994 1.97-.606-1.143-1.717-1.97-3.006-1.97-1.934 0-3.5 1.819-3.5 4.005 0 1.854 1.045 3.371 2.569 3.926.759.275 1.224-.447 1.159-1.026-.055-.48-.374-.793-.729-1.018-.485-.307-1-1.008-1-1.877 0-1.104.671-2.095 1.5-2.095s1.5.905 1.5 1.905h1.016c-.003.062-.016.121-.016.184 0 1.854 1.045 3.371 2.569 3.926.759.275 1.224-.447 1.159-1.026-.055-.479-.374-.792-.729-1.017-.485-.307-1-1.008-1-1.877 0-1.104.671-2.095 1.5-2.095S16.815 3 16.815 4h1.016c-.003.062-.016.121-.016.184 0 1.854 1.045 3.371 2.569 3.926.759.275 1.224-.447 1.159-1.026-.055-.479-.374-.792-.729-1.017-.485-.307-1-1.008-1-1.877 0-1.104.671-2.095 1.5-2.095S22.815 3 22.815 4h1.016c-.003.062-.016.121-.016.184 0 1.854 1.045 3.371 2.569 3.926.759.275 1.224-.447 1.159-1.026-.055-.479-.374-.792-.729-1.017-.485-.307-1-1.008-1-1.877 0-1.104.671-2.095 1.5-2.095S28.815 3 28.815 4h1.996C30.79 2 29.235.179 27.315.179z"/><path d="M11 15h4v4h-4zm5 0h4v4h-4zm5 0h4v4h-4zm5 0h4v4h-4zM6 20h4v4H6zm5 0h4v4h-4zm5 0h4v4h-4zm5 0h4v4h-4zm5 0h4v4h-4zM6 25h4v4H6zm5 0h4v4h-4zm5 0h4v4h-4zm5 0h4v4h-4zm5 0h4v4h-4zM6 30h4v4H6zm5 0h4v4h-4zm5 0h4v4h-4z" fill="#FFF"/></svg> \ No newline at end of file |