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/1f910.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/1f910.svg')
-rw-r--r-- | public/emoji/1f910.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f910.svg b/public/emoji/1f910.svg index 0c238b55f..873621f35 100644 --- a/public/emoji/1f910.svg +++ b/public/emoji/1f910.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,0 36,0 36,36 0,36 0,0 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.94,0 -18,8.059 -18,18 0,9.94 8.06,18 18,18 C -8.059,18 0,9.94 0,0"/></g><g transform="translate(14.0342,21.501)" id="g24"><path id="path26" 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(27.0342,21.501)" 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(25.001,8.9961)" id="g32"><path id="path34" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -15.001,0 c -1,0 -1,1 -1,1 l 0,1 c 0,0 0,1.003 1,1.003 C -14.001,3.003 0,3 0,3 L 0,0 Z"/></g><path id="path36" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 14,7.999 -2,0 0,3 2,0 0,-3 z"/><path id="path38" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16,12.999 -2,0 0,-3 2,0 0,3 z"/><path id="path40" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 12,12.999 -2,0 0,-3 2,0 0,3 z"/><path id="path42" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 17.999,7.999 -2,0 0,3 2,0 0,-3 z"/><path id="path44" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 20,12.999 -2.001,0 0,-3 2.001,0 0,3 z"/><path id="path46" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 22,7.999 -2,0 0,3 2,0 0,-3 z"/><path id="path48" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 24,12.999 -2,0 0,-3 2,0 0,3 z"/><g transform="translate(31.4834,3.8447)" id="g50"><path id="path52" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 2.308,4.186 -1.03,5.317 -2.645,2.248 0,0 Z m -5.172,7.493 c 0,0 0.265,0.964 1.231,0.699 L 3.771,6.071 c 0,0 0.964,-0.265 0.699,-1.23 -0.265,-0.964 -3.176,-6.314 -3.914,-6.984 -0.869,-0.787 -1.769,0.08 -1.769,0.08 0,0 -4.664,4.198 -5.285,4.735 -0.621,0.538 -0.373,1.275 -0.373,1.275 l 1.699,3.546 z"/></g><g transform="translate(24.8174,7.9482)" id="g54"><path id="path56" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1.754,0.839 -0.086,4.326 1.668,3.487 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><circle fill="#FFCC4D" cx="18" cy="18" r="18"/><path fill="#664500" d="M14.034 14.499c0 1.934-1.119 3.5-2.5 3.5s-2.5-1.566-2.5-3.5c0-1.933 1.119-3.5 2.5-3.5s2.5 1.567 2.5 3.5m13 0c0 1.934-1.119 3.5-2.5 3.5s-2.5-1.566-2.5-3.5c0-1.933 1.119-3.5 2.5-3.5s2.5 1.567 2.5 3.5m-2.033 12.505H10c-1 0-1-1-1-1v-1s0-1.003 1-1.003l15.001.003v3z"/><path fill="#99AAB5" d="M35.255 26.084l-7.713-2.121c-.72-.197-1.049.287-1.171.547l-1.64-.784L24 25.255v-2.254h-2v2h-2v-2h-2.001v2H16v-2h-2v2h-2v-2h-2v3h2v2h2v-2h1.999v2h2v-2H20v2h2v-2h1.643l-.58 1.212 1.648.788-.099.207s-.248.737.373 1.275c.621.537 5.285 4.735 5.285 4.735s.899.866 1.769.079c.738-.67 3.649-6.02 3.914-6.983.266-.964-.698-1.23-.698-1.23zm-3.772 6.071l-2.644-2.248 1.614-3.069 3.338 1.132-2.308 4.185z"/></svg> \ No newline at end of file |