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/1f6a2.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/1f6a2.svg')
-rw-r--r-- | public/emoji/1f6a2.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f6a2.svg b/public/emoji/1f6a2.svg index 015a830cb..79077f00a 100644 --- a/public/emoji/1f6a2.svg +++ b/public/emoji/1f6a2.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="clipPath22" clipPathUnits="userSpaceOnUse"><path id="path24" 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"><path id="path12" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16,31 4,0 0,5 -4,0 0,-5 z"/><path id="path14" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 20,30 -4,0 0,4 4,0 0,-4 z"/><path id="path16" style="fill:#a7a9ac;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 20,30 -2,0 0,4 2,0 0,-4 z"/><g id="g18"><g clip-path="url(#clipPath22)" id="g20"><g transform="translate(18,17)" id="g26"><path id="path28" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -13,0 c 0,0 1.355,-8 4.875,-14 3.519,-6 8.125,0 8.125,0 0,0 4.606,-6 8.125,0 C 11.645,-8 13,0 13,0 L 0,0 Z"/></g><g transform="translate(18,17)" id="g30"><path id="path32" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -13,0 c 0,0 1.355,-8 4.875,-14 C -4.606,-20 0,-14 0,-14 L 0,0 Z"/></g><path id="path34" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 36,6 0,6 0,0 36,0 36,6 Z"/><g transform="translate(30,27)" id="g36"><path id="path38" style="fill:#e6e7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2.45,0 -2.692,4 -21.308,4 -21.549,0 -24,0 l 0,-6 2.088,0 -0.242,-4 20.308,0 -0.242,4 L 0,-6 0,0 Z"/></g><path id="path40" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 10,21 16,0 0,-4 -16,0 0,4 z"/><path id="path42" style="fill:#6d6e71;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 8,25 20,0 0,-2 -20,0 0,2 z"/><path id="path44" style="fill:#bcbec0;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 10,29 16,0 0,-2 -16,0 0,2 z"/><g transform="translate(5.9126,13)" id="g46"><path id="path48" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 24.174,0 c 0.202,0.747 0.368,1.427 0.5,2 L -0.5,2 C -0.368,1.427 -0.2,0.747 0,0"/></g><g transform="translate(18,13)" id="g50"><path id="path52" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 12.087,0 c 0.201,0.747 0.368,1.427 0.5,2 L 0,2 0,0 Z"/></g><path id="path54" style="fill:#bcbec0;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 24,17 -12,0 0,2 12,0 0,-2 z"/><path id="path56" style="fill:#58595b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 18,34 -2,0 0,2 2,0 0,-2 z"/></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M16 0h4v5h-4z"/><path fill="#D1D3D4" d="M16 2h4v4h-4z"/><path fill="#A7A9AC" d="M18 2h2v4h-2z"/><path fill="#66757F" d="M18 19H5s1.355 8 4.875 14C13.394 39 18 33 18 33s4.606 6 8.125 0C29.645 27 31 19 31 19H18z"/><path fill="#99AAB5" d="M18 19H5s1.355 8 4.875 14C13.394 39 18 33 18 33V19z"/><path fill="#55ACEE" d="M0 30h36v6H0z"/><path fill="#E6E7E8" d="M30 9h-2.45l-.242-4H8.692l-.241 4H6v6h2.088l-.242 4h20.308l-.242-4H30z"/><path fill="#D1D3D4" d="M10 15h16v4H10z"/><path fill="#6D6E71" d="M8 11h20v2H8z"/><path fill="#BCBEC0" d="M10 7h16v2H10z"/><path fill="#BE1931" d="M5.913 23h24.174c.201-.747.368-1.427.5-2H5.413c.132.573.299 1.253.5 2z"/><path fill="#A0041E" d="M18 23h12.087c.201-.747.368-1.427.5-2H18v2z"/><path fill="#BCBEC0" d="M12 17h12v2H12z"/><path fill="#58595B" d="M16 0h2v2h-2z"/></svg> \ No newline at end of file |