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/1f357.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/1f357.svg')
-rw-r--r-- | public/emoji/1f357.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f357.svg b/public/emoji/1f357.svg index 6096785de..77d0b8724 100644 --- a/public/emoji/1f357.svg +++ b/public/emoji/1f357.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(14.0171,25.6323)" id="g20"><path id="path22" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5.844,5.844 c 0.846,1.017 0.804,2.525 -0.15,3.479 -1.011,1.011 -2.65,1.011 -3.662,0 -0.621,-0.621 -0.856,-1.479 -0.715,-2.282 -0.804,0.141 -1.661,-0.095 -2.282,-0.716 -1.011,-1.011 -1.011,-2.651 0,-3.662 0.954,-0.954 2.462,-0.995 3.479,-0.149 L -3.33,-3.33 0,0 Z"/></g><g transform="translate(32.9541,3.3643)" id="g24"><path id="path26" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.665,1.665 5.874,8.809 0.046,14.636 -4.059,4.058 -7.328,3.826 -13.416,5.335 -2.497,0.832 -5.752,3.832 -6.584,4.665 -0.833,-0.833 -0.542,-3.874 -0.542,-3.874 0,0 -3.626,-0.294 -4.458,-1.126 0.832,-0.833 4.699,-4.49 5.375,-6.207 1.821,-5.775 1.613,-8.711 5.671,-12.77 C -7.248,-6 -1.664,-1.664 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFD983" d="M14.017 10.368L8.173 4.524c.847-1.017.805-2.525-.15-3.479-1.011-1.011-2.65-1.011-3.662 0-.621.621-.856 1.478-.715 2.282-.804-.141-1.661.094-2.282.715-1.011 1.011-1.011 2.651 0 3.662.954.955 2.462.996 3.479.15l5.844 5.844 3.33-3.33z"/><path fill="#C1694F" d="M32.954 32.636c1.665-1.665 5.874-8.81.046-14.636-4.059-4.058-7.328-3.826-13.416-5.335C17.087 11.833 13.833 8.833 13 8c-.833.833-.542 3.873-.542 3.873S8.833 12.167 8 13c.833.833 4.699 4.489 5.375 6.207 1.821 5.774 1.613 8.711 5.671 12.77 6.66 6.659 12.244 2.323 13.908.659z"/></svg> \ No newline at end of file |