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/1f48e.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/1f48e.svg')
-rw-r--r-- | public/emoji/1f48e.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f48e.svg b/public/emoji/1f48e.svg index d89d98190..a379f7195 100644 --- a/public/emoji/1f48e.svg +++ b/public/emoji/1f48e.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(7.0002,33.0003)" id="g12"><path id="path14" style="fill:#bdddf4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -7,-9 3,-9 5.999,0 0,0 Z"/></g><g transform="translate(23.0004,33.0003)" id="g16"><path id="path18" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 3,-9 13,-9 5.999,0 0,0 Z"/></g><g transform="translate(26.0001,24.0003)" id="g20"><path id="path22" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -8,-21.001 10,0 0,0 Z"/></g><g transform="translate(0,24.0003)" id="g24"><path id="path26" style="fill:#8ccaf7;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 18,-21.001 10,0 0,0 Z"/></g><g transform="translate(13,33)" id="g28"><path id="path30" style="fill:#8ccaf7;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -3,-9 13,-9 10,0 0,0 Z"/></g><g transform="translate(18,3)" id="g32"><path id="path34" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -8,21 8,21 0,0 Z"/></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#BDDDF4" d="M13 3H7l-7 9h10z"/><path fill="#5DADEC" d="M36 12l-7-9h-6l3 9z"/><path fill="#4289C1" d="M26 12h10L18 33z"/><path fill="#8CCAF7" d="M10 12H0l18 21zm3-9l-3 9h16l-3-9z"/><path fill="#5DADEC" d="M18 33l-8-21h16z"/></svg> \ No newline at end of file |