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/1f925.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/1f925.svg')
-rw-r--r-- | public/emoji/1f925.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f925.svg b/public/emoji/1f925.svg index a78baff89..9f255307c 100644 --- a/public/emoji/1f925.svg +++ b/public/emoji/1f925.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(32,18)" id="g20"><path id="path22" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-8.836 -7.164,-16 -16,-16 -8.836,0 -16,7.164 -16,16 0,8.836 7.164,16 16,16 C -7.164,16 0,8.836 0,0"/></g><g transform="translate(11.4707,22.4707)" id="g24"><path id="path26" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.706 -0.987,-3.088 -2.206,-3.088 -1.218,0 -2.206,1.382 -2.206,3.088 0,1.705 0.988,3.088 2.206,3.088 C -0.987,3.088 0,1.705 0,0"/></g><g transform="translate(23,22.4707)" id="g28"><path id="path30" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.706 -0.987,-3.088 -2.206,-3.088 -1.218,0 -2.206,1.382 -2.206,3.088 0,1.705 0.988,3.088 2.206,3.088 C -0.987,3.088 0,1.705 0,0"/></g><g transform="translate(10.1177,6.6177)" id="g32"><path id="path34" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.765,4.412 11.471,4.412 11.471,2.647 11.471,1.765 4.412,3.529 0,0"/></g><g transform="translate(32.2617,18.5)" id="g36"><path id="path38" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -15.262,0 c -1.51,0 -2.734,-1.344 -2.734,-3 0,-1.657 1.224,-3 2.734,-3 L 0,-6 c 1.513,0 2.738,1.343 2.738,3 0,1.656 -1.225,3 -2.738,3"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><circle fill="#FFCC4D" cx="16" cy="18" r="16"/><path fill="#664500" d="M11.471 13.529c0 1.706-.987 3.088-2.206 3.088-1.219 0-2.206-1.382-2.206-3.088 0-1.705.987-3.088 2.206-3.088 1.218 0 2.206 1.383 2.206 3.088zm11.529 0c0 1.706-.987 3.088-2.206 3.088-1.218 0-2.206-1.382-2.206-3.088 0-1.705.988-3.088 2.206-3.088 1.219 0 2.206 1.383 2.206 3.088zM10.118 29.382c1.765-4.412 11.471-4.412 11.471-2.647-.001.883-7.06-.882-11.471 2.647z"/><path fill="#F4900C" d="M32.262 17.5H17c-1.511 0-2.734 1.344-2.734 3 0 1.657 1.224 3 2.734 3h15.262c1.513 0 2.738-1.343 2.738-3 0-1.656-1.226-3-2.738-3z"/></svg> \ No newline at end of file |