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/1f45d.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/1f45d.svg')
-rw-r--r-- | public/emoji/1f45d.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f45d.svg b/public/emoji/1f45d.svg index 4cadb52c7..6d6b1364d 100644 --- a/public/emoji/1f45d.svg +++ b/public/emoji/1f45d.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(10,25)" id="g20"><path id="path22" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -10,-2 -10,-7 0,-2.043 1.069,-2.964 2.507,-2.964 C -4.531,-9.964 0,-6.059 0,0 m -2.402,-2.736 c -0.993,-3.26 -3.588,-5.228 -5.091,-5.228 -0.261,0 -0.507,0 -0.507,0.964 0,1.699 2.78,3.284 5.598,4.264"/></g><g transform="translate(33.752,21.0308)" id="g24"><path id="path26" style="fill:#a6d388;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.272,2.183 -2.295,3.969 -4.495,3.969 l -18.514,0 c -2.2,0 -4.222,-1.786 -4.495,-3.969 l -1.753,-14.061 c -0.272,-2.184 1.305,-3.97 3.505,-3.97 l 24,0 c 2.2,0 3.777,1.786 3.505,3.97 L 0,0 Z"/></g><g transform="translate(8,23)" id="g28"><path id="path30" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 2.5,-8.5 4,-7 5.5,-5.5 0,0 0,0"/></g><g transform="translate(31.2578,23)" id="g32"><path id="path34" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -2.5,-8.5 -4,-7 -1.5,1.5 4,7 4,7"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#C1694F" d="M7.598 13.736c-.993 3.26-3.588 5.228-5.091 5.228-.261 0-.507 0-.507-.964 0-1.699 2.78-3.284 5.598-4.264M10 11S0 13 0 18c0 2.043 1.069 2.964 2.507 2.964C5.469 20.964 10 17.059 10 11z"/><path fill="#A6D388" d="M33.752 14.969C33.479 12.786 31.457 11 29.257 11H10.743c-2.2 0-4.223 1.786-4.495 3.969L4.495 29.03C4.223 31.214 5.8 33 8 33h24c2.2 0 3.777-1.786 3.505-3.97l-1.753-14.061z"/><path fill="#77B255" d="M8 13s2.5 8.5 4 7-4-7-4-7zm23.258 0s-2.5 8.5-4 7 4-7 4-7z"/></svg> \ No newline at end of file |