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/1f928.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/1f928.svg')
-rw-r--r-- | public/emoji/1f928.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f928.svg b/public/emoji/1f928.svg index 5b7fda886..126e459b2 100644 --- a/public/emoji/1f928.svg +++ b/public/emoji/1f928.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:#ffcc4d;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(14.5,19.5)" id="g24"><path id="path26" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.519 -1.119,-2.75 -2.5,-2.75 -3.881,-2.75 -5,-1.519 -5,0 -5,1.518 -3.881,2.75 -2.5,2.75 -1.119,2.75 0,1.518 0,0"/></g><g transform="translate(26.5,19.5)" id="g28"><path id="path30" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.934 -1.119,-3.5 -2.5,-3.5 -3.881,-3.5 -5,-1.934 -5,0 -5,1.933 -3.881,3.5 -2.5,3.5 -1.119,3.5 0,1.933 0,0"/></g><g transform="translate(7.1023,23.4414)" id="g32"><path id="path34" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.249,-0.176 0.574,-0.236 0.885,-0.135 5.072,1.22 7.912,-0.689 8.031,-0.771 8.484,-1.083 9.106,-0.972 9.421,-0.521 9.736,-0.069 9.629,0.55 9.179,0.867 9.029,0.973 5.443,3.442 0.27,1.768 -0.256,1.598 -0.544,1.034 -0.374,0.509 -0.305,0.295 -0.171,0.12 0,0"/></g><g transform="translate(25,10)" id="g36"><path id="path38" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -14,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L 0,2 C 0.553,2 1,1.553 1,1 1,0.447 0.553,0 0,0"/></g><g transform="translate(30.001,25.5918)" id="g40"><path id="path42" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.368,0 -0.731,0.161 -0.979,0.471 -1.394,1.751 -4.298,3.287 -5.314,3.287 -0.642,0 -1.925,-0.91 -2.604,-1.568 -0.496,-0.482 -1.288,-0.466 -1.767,0.028 -0.481,0.495 -0.469,1.284 0.024,1.765 0.391,0.38 2.436,2.275 4.347,2.275 2.005,0 5.538,-2.055 7.27,-4.229 C 1.407,1.489 1.317,0.703 0.778,0.272 0.548,0.089 0.272,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCC4D" d="M36 18c0 9.941-8.059 18-18 18S0 27.941 0 18 8.059 0 18 0s18 8.059 18 18"/><ellipse fill="#664500" cx="12" cy="16.5" rx="2.5" ry="2.75"/><ellipse fill="#664500" cx="24" cy="16.5" rx="2.5" ry="3.5"/><path fill="#664500" d="M7.102 12.559c.249.176.574.236.885.135 4.187-1.355 7.027.554 7.146.636.453.312 1.075.201 1.39-.25.315-.451.208-1.071-.241-1.388-.15-.106-3.736-2.575-8.91-.901-.526.17-.814.734-.643 1.259.068.214.203.388.373.509zM25 26H11c-.552 0-1-.447-1-1s.448-1 1-1h14c.553 0 1 .447 1 1s-.447 1-1 1zm5.001-15.592c-.368 0-.731-.161-.979-.471-1.395-1.751-4.299-3.287-5.314-3.287-.642 0-1.925.911-2.604 1.568-.496.482-1.288.467-1.767-.028-.48-.495-.469-1.285.024-1.766.391-.38 2.436-2.275 4.347-2.275 2.005 0 5.538 2.056 7.27 4.229.431.54.341 1.326-.198 1.756-.231.185-.507.274-.779.274z"/></svg> \ No newline at end of file |