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/1f362.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/1f362.svg')
-rw-r--r-- | public/emoji/1f362.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f362.svg b/public/emoji/1f362.svg index c7dda46dc..f5f7653af 100644 --- a/public/emoji/1f362.svg +++ b/public/emoji/1f362.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(33.8838,0.7705)" id="g20"><path id="path22" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.314,0 -0.629,0.12 -0.869,0.36 l -30.685,30.685 c -0.48,0.48 -0.48,1.258 0,1.738 0.48,0.481 1.259,0.481 1.739,0 L 0.869,2.099 C 1.35,1.619 1.35,0.84 0.869,0.36 0.629,0.12 0.314,0 0,0"/></g><g transform="translate(6.7285,32.9541)" id="g24"><path id="path26" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.651,0.536 -4.261,-1.167 -3.578,-3.784 l 1.843,-7.055 c 0.684,-2.617 2.808,-3.193 4.72,-1.28 l 6.103,6.102 C 11,-4.104 10.396,-2.101 7.745,-1.565 L 0,0 Z"/></g><g transform="translate(22.6143,20.0317)" id="g28"><path id="path30" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.734 -3.027,-6.761 -6.762,-6.761 -3.735,0 -6.762,3.027 -6.762,6.761 0,3.734 3.027,6.762 6.762,6.762 C -3.027,6.762 0,3.734 0,0"/></g><g transform="translate(22.0518,5.293)" id="g32"><path id="path34" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.96,-0.96 -2.518,-0.96 -3.477,0 l -3.478,3.478 c -0.959,0.959 -0.959,2.516 0,3.476 l 8.693,8.693 c 0.961,0.96 2.518,0.96 3.478,0 L 8.693,12.17 c 0.96,-0.96 0.96,-2.517 0,-3.478 L 0,0 Z"/></g><g transform="translate(33.8838,0.7705)" id="g36"><path id="path38" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.314,0 -0.629,0.12 -0.869,0.36 l -9.118,9.119 c -0.481,0.479 -0.481,1.258 0,1.738 0.48,0.48 1.257,0.48 1.738,0 L 0.869,2.099 C 1.35,1.619 1.35,0.84 0.869,0.36 0.629,0.12 0.314,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#D99E82" d="M33.884 35.229c-.314 0-.629-.12-.869-.36L2.33 4.185c-.48-.48-.48-1.258 0-1.738.479-.48 1.259-.48 1.738 0l30.685 30.685c.48.479.48 1.259 0 1.738-.24.239-.555.359-.869.359z"/><path fill="#66757F" d="M6.729 3.046C4.077 2.51 2.467 4.213 3.151 6.83l1.843 7.055c.684 2.617 2.808 3.193 4.72 1.28l6.103-6.102c1.913-1.913 1.309-3.916-1.343-4.452L6.729 3.046z"/><path fill="#D99E82" d="M22.614 15.968c0 3.734-3.027 6.761-6.762 6.761-3.734 0-6.762-3.027-6.762-6.761s3.027-6.762 6.762-6.762c3.735.001 6.762 3.028 6.762 6.762z"/><path fill="#CCD6DD" d="M22.052 30.707c-.96.96-2.518.96-3.477 0l-3.478-3.478c-.959-.96-.959-2.517 0-3.477l8.693-8.693c.961-.96 2.518-.96 3.478 0l3.478 3.477c.96.961.96 2.517 0 3.478l-8.694 8.693z"/><path fill="#D99E82" d="M33.884 35.229c-.314 0-.629-.12-.869-.36l-9.118-9.118c-.48-.479-.48-1.259 0-1.738.481-.48 1.258-.48 1.738 0l9.118 9.118c.48.479.48 1.259 0 1.738-.24.24-.555.36-.869.36z"/></svg> \ No newline at end of file |