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/1f344.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/1f344.svg')
-rw-r--r-- | public/emoji/1f344.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f344.svg b/public/emoji/1f344.svg index 2ebc9dd2e..0cf7a7914 100644 --- a/public/emoji/1f344.svg +++ b/public/emoji/1f344.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><clipPath id="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="M 18,36 C 8.059,36 0,28 0,18 l 0,0 c 0,-2.209 1.791,-4 4,-4 l 0,0 28,0 c 2.209,0 4,1.791 4,4 l 0,0 c 0,10 -8.059,18 -18,18 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,3)" id="g20"><path id="path22" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-3 -4,-3 l -10,0 c -2.209,0 -4,0.791 -4,3 0,2.209 3,7 3,13 0,6 12,6 12,0 C -3,7 0,2.209 0,0"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g transform="translate(18,36.6113)" id="g32"><path id="path34" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -10.494,0 -19,-8.639 -19,-19.194 0,-2.332 1.891,-4.417 4.222,-4.417 l 29.555,0 c 2.332,0 4.223,2.085 4.223,4.417 C 19,-8.639 10.494,0 0,0"/></g><g transform="translate(7.7085,19.542)" id="g36"><path id="path38" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.4,0 -6.167,2.766 -6.167,6.166 0,3.401 2.767,6.167 6.167,6.167 3.4,0 6.167,-2.766 6.167,-6.167 C 6.167,2.766 3.4,0 0,0"/></g><g transform="translate(7.7085,32)" id="g40"><path id="path42" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.475,0 -6.292,-2.817 -6.292,-6.292 0,-3.474 2.817,-6.291 6.292,-6.291 3.475,0 6.292,2.817 6.292,6.291 C 6.292,-2.817 3.475,0 0,0 m 0,-0.25 c 3.331,0 6.042,-2.71 6.042,-6.042 0,-3.331 -2.711,-6.041 -6.042,-6.041 -3.331,0 -6.042,2.71 -6.042,6.041 0,3.332 2.711,6.042 6.042,6.042"/></g><g transform="translate(34.666,24.8115)" id="g44"><path id="path46" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.96,2.357 -2.404,4.455 -4.209,6.184 -6.674,6.16 -8.666,4.159 -8.666,1.688 c 0,-2.485 2.015,-4.5 4.5,-4.5 1.887,0 3.497,1.165 4.166,2.812"/></g><g transform="translate(26,20)" id="g48"><path id="path50" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-2.485 -2.015,-4.5 -4.5,-4.5 -6.985,-4.5 -9,-2.485 -9,0 -9,2.485 -6.985,4.5 -4.5,4.5 -2.015,4.5 0,2.485 0,0"/></g><g transform="translate(23,31)" id="g52"><path id="path54" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.656 -1.343,-3 -3,-3 -1.657,0 -3,1.344 -3,3 0,1.657 1.343,3 3,3 1.657,0 3,-1.343 3,-3"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#99AAB5" d="M27 33c0 2.209-1.791 3-4 3H13c-2.209 0-4-.791-4-3s3-7 3-13 12-6 12 0 3 10.791 3 13z"/><path fill="#DD2E44" d="M34.666 11.189l-.001-.002c-.96-2.357-2.404-4.453-4.208-6.182h-.003C27.222 1.904 22.839 0 18 0 13.638 0 9.639 1.541 6.524 4.115c-2.19 1.809-3.941 4.13-5.076 6.785C.518 13.075 0 15.473 0 18c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4 0-2.417-.48-4.713-1.334-6.811z"/><g fill="#F4ABBA"><path d="M7.708 16.583c3.475 0 6.292-2.817 6.292-6.292S11.184 4 7.708 4c-.405 0-.8.042-1.184.115-2.19 1.809-3.941 4.13-5.076 6.785.306 3.189 2.991 5.683 6.26 5.683z"/><path d="M7.708 4.25c3.331 0 6.041 2.71 6.041 6.042s-2.71 6.042-6.041 6.042c-3.107 0-5.678-2.314-6.006-5.394 1.097-2.541 2.8-4.817 4.931-6.59.364-.067.726-.1 1.075-.1m0-.25c-.405 0-.8.042-1.184.115-2.19 1.809-3.941 4.13-5.076 6.785.306 3.189 2.992 5.683 6.261 5.683 3.475 0 6.291-2.817 6.291-6.292S11.184 4 7.708 4zM26 9.5c0 2.485 2.015 4.5 4.5 4.5 1.887 0 3.497-1.164 4.166-2.811l-.001-.002c-.96-2.357-2.404-4.453-4.208-6.182C27.992 5.028 26 7.029 26 9.5z"/><circle cx="21.5" cy="16" r="4.5"/><circle cx="20" cy="5" r="3"/></g></svg> \ No newline at end of file |