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/1f49d.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/1f49d.svg')
-rw-r--r-- | public/emoji/1f49d.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f49d.svg b/public/emoji/1f49d.svg index aab714aaf..72f8e7afa 100644 --- a/public/emoji/1f49d.svg +++ b/public/emoji/1f49d.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(35.8848,24.1665)" id="g20"><path id="path22" style="fill:#e75a70;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.45 -4.418,9.868 -9.867,9.868 -3.308,0 -6.227,-1.633 -8.018,-4.129 -1.79,2.496 -4.71,4.129 -8.017,4.129 -5.45,0 -9.868,-4.418 -9.868,-9.868 0,-0.772 0.098,-1.52 0.266,-2.241 1.371,-8.512 10.835,-17.494 17.619,-19.96 6.783,2.466 16.249,11.448 17.617,19.96 C -0.098,-1.52 0,-0.772 0,0"/></g><g transform="translate(36,21.0005)" id="g24"><path id="path26" style="fill:#fdd888;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1,-5.001 -4,-8.001 -4,-8.001 l -28,0 c 0,0 -3,3 -4,8.001 L 0,0 Z"/></g><g transform="translate(14,18)" id="g28"><path id="path30" style="fill:#fdd888;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-18 -5,5 -5,-5 0,18 10,0 z"/></g><g transform="translate(16.8022,26.8062)" id="g32"><path id="path34" style="fill:#fdcb58;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -7.879,-5.515 -15.757,0 c -0.575,0.402 -1.045,0.158 -1.045,-0.544 l 0,-14.659 c 0,-0.703 0.48,-0.964 1.069,-0.582 l 7.854,5.106 7.855,-5.106 c 0.588,-0.382 1.068,-0.121 1.068,0.582 l 0,14.659 C 1.044,0.158 0.574,0.402 0,0"/></g><g transform="translate(13,19)" id="g36"><path id="path38" style="fill:#fdd888;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.21 -1.79,-4 -4,-4 -2.209,0 -4,1.79 -4,4 0,2.21 1.791,4 4,4 2.21,0 4,-1.79 4,-4"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E75A70" d="M35.885 11.833c0-5.45-4.418-9.868-9.867-9.868-3.308 0-6.227 1.633-8.018 4.129-1.791-2.496-4.71-4.129-8.017-4.129-5.45 0-9.868 4.417-9.868 9.868 0 .772.098 1.52.266 2.241C1.751 22.587 11.216 31.568 18 34.034c6.783-2.466 16.249-11.447 17.617-19.959.17-.721.268-1.469.268-2.242z"/><path fill="#FDD888" d="M36 15c-1 5-4 8-4 8H4s-3-3-4-8h36z"/><path fill="#FDD888" d="M14 18v18l-5-5-5 5V18z"/><path fill="#FDCB58" d="M16.802 9.194l-7.879 5.515-7.878-5.515C.47 8.792 0 9.036 0 9.738v14.658c0 .703.48.965 1.069.582l7.854-5.106 7.854 5.106c.588.383 1.069.121 1.069-.582V9.738c.001-.702-.47-.946-1.044-.544z"/><circle fill="#FDD888" cx="9" cy="17" r="4"/></svg> \ No newline at end of file |