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/2699.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/2699.svg')
-rw-r--r-- | public/emoji/2699.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/2699.svg b/public/emoji/2699.svg index 616e7960f..635ca02f2 100644 --- a/public/emoji/2699.svg +++ b/public/emoji/2699.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,10)" id="g20"><path id="path22" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4.419,0 -8,3.582 -8,8 0,4.419 3.581,8 8,8 C 4.418,16 8,12.419 8,8 8,3.582 4.418,0 0,0 m 16,11 -3.362,0 c -0.324,1.369 -0.863,2.651 -1.582,3.814 l 2.379,2.378 c 0.781,0.782 0.781,2.048 0,2.829 l -1.414,1.414 c -0.782,0.781 -2.047,0.781 -2.829,0 L 6.814,19.056 C 5.65,19.775 4.369,20.314 3,20.638 L 3,24 c 0,1.104 -0.895,2 -2,2 l -2,0 c -1.104,0 -2,-0.896 -2,-2 l 0,-3.362 c -1.369,-0.324 -2.65,-0.863 -3.814,-1.582 l -2.378,2.379 c -0.782,0.781 -2.048,0.781 -2.829,0 l -1.414,-1.414 c -0.781,-0.781 -0.781,-2.048 -10e-4,-2.829 l 2.38,-2.378 C -11.775,13.65 -12.314,12.368 -12.638,11 L -16,11 c -1.104,0 -2,-0.895 -2,-2 l 0,-2 c 0,-1.104 0.896,-2 2,-2 l 3.362,0 c 0.324,-1.368 0.863,-2.65 1.582,-3.813 l -2.38,-2.379 c -0.78,-0.781 -0.78,-2.048 10e-4,-2.829 l 1.414,-1.415 c 0.781,-0.78 2.047,-0.78 2.829,0 l 2.378,2.38 C -5.65,-3.775 -4.369,-4.314 -3,-4.638 L -3,-8 c 0,-1.105 0.896,-2 2,-2 l 2,0 c 1.105,0 2,0.895 2,2 l 0,3.362 c 1.368,0.324 2.65,0.863 3.813,1.582 l 2.379,-2.38 c 0.782,-0.781 2.047,-0.781 2.829,0 l 1.414,1.415 c 0.781,0.781 0.781,2.047 0,2.829 L 11.056,1.186 C 11.775,2.349 12.314,3.631 12.638,5 L 16,5 c 1.105,0 2,0.896 2,2 l 0,2 c 0,1.105 -0.895,2 -2,2"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#66757F" d="M34 15h-3.362c-.324-1.369-.864-2.651-1.582-3.814l2.379-2.379c.781-.781.781-2.048 0-2.829l-1.414-1.414c-.781-.781-2.047-.781-2.828 0l-2.379 2.379C23.65 6.225 22.369 5.686 21 5.362V2c0-1.104-.896-2-2-2h-2c-1.104 0-2 .896-2 2v3.362c-1.369.324-2.651.864-3.814 1.582L8.808 4.565c-.781-.781-2.048-.781-2.828 0L4.565 5.979c-.781.781-.781 2.048-.001 2.829l2.379 2.379C6.225 12.35 5.686 13.632 5.362 15H2c-1.104 0-2 .896-2 2v2c0 1.104.896 2 2 2h3.362c.324 1.368.864 2.65 1.582 3.813l-2.379 2.379c-.78.78-.78 2.048.001 2.829l1.414 1.414c.78.78 2.047.78 2.828 0l2.379-2.379c1.163.719 2.445 1.258 3.814 1.582V34c0 1.104.896 2 2 2h2c1.104 0 2-.896 2-2v-3.362c1.368-.324 2.65-.864 3.813-1.582l2.379 2.379c.781.781 2.047.781 2.828 0l1.414-1.414c.781-.781.781-2.048 0-2.829l-2.379-2.379c.719-1.163 1.258-2.445 1.582-3.814H34c1.104 0 2-.896 2-2v-2C36 15.896 35.104 15 34 15zM18 26c-4.418 0-8-3.582-8-8s3.582-8 8-8 8 3.582 8 8-3.582 8-8 8z"/></svg> \ No newline at end of file |