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/1f68f.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/1f68f.svg')
-rw-r--r-- | public/emoji/1f68f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f68f.svg b/public/emoji/1f68f.svg index e224dbc7e..f833b4aab 100644 --- a/public/emoji/1f68f.svg +++ b/public/emoji/1f68f.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:#6d6e71;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 14,0 2,0 0,29 -2,0 0,-29 z"/><path id="path14" style="fill:#6d6e71;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 18,15 -3,0 0,2 3,0 0,-2 z"/><path id="path16" style="fill:#6d6e71;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 18,21 -3,0 0,2 3,0 0,-2 z"/><g id="g18"><g clip-path="url(#clipPath22)" id="g20"><g transform="translate(29,12)" id="g26"><path id="path28" style="fill:#bcbec0;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -9,0 c -0.553,0 -1,0.447 -1,1 l 0,14 c 0,0.552 0.447,1 1,1 l 9,0 c 0.553,0 1,-0.448 1,-1 L 0,0 Z"/></g><g transform="translate(29,23)" id="g30"><path id="path32" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,3 c 0,0.552 -0.447,1 -1,1 l -9,0 c -0.553,0 -1,-0.448 -1,-1 l 0,-3 11,0 z"/></g><g transform="translate(21,2)" id="g34"><path id="path36" style="fill:#6d6e71;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -12,0 -1,-1 0,-1 14,0 0,1 -1,1 z"/></g><g transform="translate(19,4)" id="g38"><path id="path40" style="fill:#6d6e71;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -8,0 -1,-1 0,-1 10,0 0,1 -1,1 z"/></g><g transform="translate(11,32)" id="g42"><path id="path44" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,2.209 1.791,4 4,4 6.209,4 8,2.209 8,0 8,-2.209 6.209,-4 4,-4 1.791,-4 0,-2.209 0,0"/></g><path id="path46" style="fill:#808285;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 23,20 -3,0 0,3 3,0 0,-3 z"/><path id="path48" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 23,16 -3,0 0,3 3,0 0,-3 z"/><path id="path50" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 23,12 -3,0 0,3 3,0 0,-3 z"/><path id="path52" style="fill:#808285;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 27,20 -3,0 0,3 3,0 0,-3 z"/><path id="path54" style="fill:#808285;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 27,16 -3,0 0,3 3,0 0,-3 z"/><path id="path56" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 27,12 -3,0 0,3 3,0 0,-3 z"/><path id="path58" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 17,30 -4,0 0,4 4,0 0,-4 z"/><path id="path60" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 27,24 -7,0 0,2 7,0 0,-2 z"/></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#6D6E71" d="M14 7h2v29h-2z"/><path fill="#6D6E71" d="M15 19h3v2h-3zm0-6h3v2h-3z"/><path fill="#BCBEC0" d="M29 24c0 .553-.447 1-1 1h-9c-.553 0-1-.447-1-1V10c0-.552.447-1 1-1h9c.553 0 1 .448 1 1v14z"/><path fill="#BE1931" d="M29 13v-3c0-.552-.447-1-1-1h-9c-.553 0-1 .448-1 1v3h11z"/><path fill="#6D6E71" d="M21 34H9l-1 1v1h14v-1zm-2-2h-8l-1 1v1h10v-1z"/><circle fill="#BE1931" cx="15" cy="4" r="4"/><path fill="#808285" d="M20 13h3v3h-3z"/><path fill="#F4900C" d="M20 17h3v3h-3zm0 4h3v3h-3z"/><path fill="#808285" d="M24 13h3v3h-3zm0 4h3v3h-3z"/><path fill="#F4900C" d="M24 21h3v3h-3z"/><path fill="#DD2E44" d="M13 2h4v4h-4zm7 8h7v2h-7z"/></svg> \ No newline at end of file |