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/3030.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/3030.svg')
-rw-r--r-- | public/emoji/3030.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/3030.svg b/public/emoji/3030.svg index 85addce18..8ea114101 100644 --- a/public/emoji/3030.svg +++ b/public/emoji/3030.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,13)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.589,0 -4.005,2.549 -5.374,5.014 -6.463,6.974 -7.589,9 -9,9 -10.412,9 -11.537,6.974 -12.626,5.014 -13.996,2.549 -15.412,0 -18,0 -20.65,0 -21.853,2.706 -22.914,5.094 -23.962,7.454 -24.744,9 -26,9 c -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 2.65,0 3.853,-2.706 4.914,-5.094 C -20.038,3.547 -19.256,2 -18,2 c 1.412,0 2.537,2.026 3.626,3.986 C -13.004,8.451 -11.588,11 -9,11 -6.411,11 -4.995,8.451 -3.626,5.986 -2.537,4.026 -1.411,2 0,2 1.256,2 2.037,3.547 3.086,5.906 4.148,8.294 5.351,11 8,11 8.553,11 9,10.552 9,10 9,9.448 8.553,9 8,9 6.744,9 5.963,7.454 4.914,5.094 3.853,2.706 2.649,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M27 23c-2.589 0-4.005-2.549-5.374-5.014C20.537 16.026 19.411 14 18 14c-1.412 0-2.537 2.026-3.626 3.986C13.004 20.451 11.588 23 9 23c-2.65 0-3.853-2.706-4.914-5.094C3.038 15.546 2.256 14 1 14c-.552 0-1-.448-1-1s.448-1 1-1c2.65 0 3.853 2.706 4.914 5.094C6.962 19.453 7.744 21 9 21c1.412 0 2.537-2.026 3.626-3.986C13.996 14.549 15.412 12 18 12c2.589 0 4.005 2.549 5.374 5.014C24.463 18.974 25.589 21 27 21c1.256 0 2.037-1.547 3.086-3.906C31.147 14.706 32.351 12 35 12c.553 0 1 .448 1 1s-.447 1-1 1c-1.256 0-2.037 1.546-3.086 3.906C30.853 20.294 29.649 23 27 23z"/></svg> \ No newline at end of file |