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/1f456.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/1f456.svg')
| -rw-r--r-- | public/emoji/1f456.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f456.svg b/public/emoji/1f456.svg index 8f07c2078..44191ae45 100644 --- a/public/emoji/1f456.svg +++ b/public/emoji/1f456.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"/><g transform="matrix(1.25,0,0,-1.25,0,45)" id="g10"><g transform="translate(9.9999,36)" id="g12"><path id="path14" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,-4.568 -6.181,-33.682 1.545,-36 7.955,-12.819 10.182,0 0,0 Z"/></g><g transform="translate(15.8184,36)" id="g16"><path id="path18" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 2.227,-12.819 8.635,-36 16.363,-33.682 10.182,-4.568 10.182,0 0,0 Z"/></g><path id="path20" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26,32 -16,0 0,2 16,0 0,-2 z"/><g transform="translate(19,24)" id="g22"><path id="path24" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2,0 -6,2 4,2 0,0 Z"/></g><path id="path26" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 12,33 2.001,0 0,3 -2.001,0 0,-3 z"/><path id="path28" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 22,33 2.001,0 0,3 -2.001,0 0,-3 z"/><path id="path30" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16,25 2,0 0,7 -2,0 0,-7 z"/></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#3B88C3" d="M20.182 0H10v4.568L3.818 33.682 11.545 36l6.41-23.182z"/><path fill="#3B88C3" d="M15.818 0H26v4.568l6.182 29.114L24.454 36l-6.409-23.182z"/><path fill="#269" d="M10 2h16v2H10zm9 10h-2l-4-2h10z"/><path fill="#269" d="M12 0h2v3h-2zm10 0h2v3h-2zm-6 4h2v7h-2z"/></svg> \ No newline at end of file |
