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/24c2.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/24c2.svg')
-rw-r--r-- | public/emoji/24c2.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/24c2.svg b/public/emoji/24c2.svg index bd4ca96a7..29a942974 100644 --- a/public/emoji/24c2.svg +++ b/public/emoji/24c2.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(36,18)" id="g20"><path id="path22" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-9.941 -8.059,-18 -18,-18 -9.941,0 -18,8.059 -18,18 0,9.941 8.059,18 18,18 C -8.059,18 0,9.941 0,0"/></g><g transform="translate(8.1738,26.875)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.186,1.116 1.395,2.387 3.039,2.387 1.55,0 2.759,-1.116 3.1,-2.232 l 3.659,-12.278 0.062,0 3.659,12.278 c 0.34,1.116 1.549,2.232 3.1,2.232 1.643,0 2.852,-1.271 3.039,-2.387 l 2.883,-17.302 c 0.031,-0.185 0.031,-0.372 0.031,-0.526 0,-1.365 -0.992,-2.233 -2.232,-2.233 -1.582,0 -2.201,0.713 -2.418,2.17 l -1.83,12.62 -0.063,0 -3.72,-12.992 c -0.217,-0.744 -0.805,-1.798 -2.48,-1.798 -1.674,0 -2.264,1.054 -2.481,1.798 l -3.721,12.992 -0.061,0 -1.83,-12.62 c -0.217,-1.457 -0.837,-2.17 -2.418,-2.17 -1.24,0 -2.233,0.868 -2.233,2.233 0,0.154 0,0.341 0.032,0.526 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#3B88C3" d="M36 18c0 9.941-8.059 18-18 18S0 27.941 0 18 8.059 0 18 0s18 8.059 18 18z"/><path fill="#FFF" d="M8.174 9.125c.186-1.116 1.395-2.387 3.039-2.387 1.55 0 2.76 1.116 3.101 2.232l3.659 12.278h.062L21.692 8.97c.341-1.116 1.55-2.232 3.101-2.232 1.642 0 2.852 1.271 3.039 2.387l2.883 17.302c.031.186.031.372.031.526 0 1.365-.992 2.232-2.232 2.232-1.582 0-2.201-.713-2.418-2.17l-1.83-12.619h-.062l-3.721 12.991c-.217.744-.805 1.798-2.48 1.798-1.674 0-2.263-1.054-2.48-1.798l-3.721-12.991h-.062l-1.83 12.62c-.217 1.457-.837 2.17-2.418 2.17-1.24 0-2.232-.867-2.232-2.232 0-.154 0-.341.031-.526L8.174 9.125z"/></svg> \ No newline at end of file |