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/1f399.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/1f399.svg')
-rw-r--r-- | public/emoji/1f399.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f399.svg b/public/emoji/1f399.svg index 853475c23..07881e4aa 100644 --- a/public/emoji/1f399.svg +++ b/public/emoji/1f399.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="clipPath18" clipPathUnits="userSpaceOnUse"><path id="path20" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath38" clipPathUnits="userSpaceOnUse"><path id="path40" d="M 18,36 C 13.029,36 9,31.971 9,27 l 0,0 0,-8 c 0,-4.971 4.029,-9 9,-9 l 0,0 c 4.971,0 9,4.029 9,9 l 0,0 0,8 c 0,4.971 -4.029,9 -9,9 z"/></clipPath><clipPath id="clipPath96" clipPathUnits="userSpaceOnUse"><path id="path98" 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 30,19 -24,0 0,2 24,0 0,-2 z"/><g id="g14"><g clip-path="url(#clipPath18)" id="g16"><g transform="translate(21,6)" id="g22"><path id="path24" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.208 -0.792,-4 -3,-4 -2.209,0 -3,1.792 -3,4 0,2.208 0.791,2 3,2 2.208,0 3,0.208 3,-2"/></g><g transform="translate(18,5)" id="g26"><path id="path28" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -6.627,0 -10,-1.343 -10,-3 l 0,-2 20,0 0,2 C 10,-1.343 6.627,0 0,0"/></g><g transform="translate(27,19)" id="g30"><path id="path32" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.971 -4.029,-9 -9,-9 -4.971,0 -9,4.029 -9,9 l 0,8 c 0,4.971 4.029,9 9,9 4.971,0 9,-4.029 9,-9 L 0,0 Z"/></g></g></g><g id="g34"><g clip-path="url(#clipPath38)" id="g36"><g transform="translate(17,33.5)" id="g42"><path id="path44" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.829 -0.672,-1.5 -1.5,-1.5 -2.329,-1.5 -3,-0.829 -3,0 -3,0.829 -2.329,1.5 -1.5,1.5 -0.672,1.5 0,0.829 0,0"/></g><g transform="translate(22,33.5)" id="g46"><path id="path48" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.829 -0.672,-1.5 -1.5,-1.5 -2.328,-1.5 -3,-0.829 -3,0 -3,0.829 -2.328,1.5 -1.5,1.5 -0.672,1.5 0,0.829 0,0"/></g><g transform="translate(19,29.5)" id="g50"><path id="path52" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.829 -0.672,-1.5 -1.5,-1.5 -2.329,-1.5 -3,-0.829 -3,0 -3,0.829 -2.329,1.5 -1.5,1.5 -0.672,1.5 0,0.829 0,0"/></g><g transform="translate(24,29.5)" id="g54"><path id="path56" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.829 -0.672,-1.5 -1.5,-1.5 -2.328,-1.5 -3,-0.829 -3,0 -3,0.829 -2.328,1.5 -1.5,1.5 -0.672,1.5 0,0.829 0,0"/></g><g transform="translate(14,29.5)" id="g58"><path id="path60" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.829 -0.672,-1.5 -1.5,-1.5 -2.328,-1.5 -3,-0.829 -3,0 -3,0.829 -2.328,1.5 -1.5,1.5 -0.672,1.5 0,0.829 0,0"/></g><g transform="translate(17,25.5)" id="g62"><path id="path64" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.829 -0.672,-1.5 -1.5,-1.5 -2.329,-1.5 -3,-0.829 -3,0 -3,0.829 -2.329,1.5 -1.5,1.5 -0.672,1.5 0,0.829 0,0"/></g><g transform="translate(12,25.5)" id="g66"><path id="path68" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.829 -0.672,-1.5 -1.5,-1.5 -2.329,-1.5 -3,-0.829 -3,0 -3,0.829 -2.329,1.5 -1.5,1.5 -0.672,1.5 0,0.829 0,0"/></g><g transform="translate(22,25.5)" id="g70"><path id="path72" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.829 -0.672,-1.5 -1.5,-1.5 -2.328,-1.5 -3,-0.829 -3,0 -3,0.829 -2.328,1.5 -1.5,1.5 -0.672,1.5 0,0.829 0,0"/></g><g transform="translate(27,25.5)" id="g74"><path id="path76" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.829 -0.672,-1.5 -1.5,-1.5 -2.328,-1.5 -3,-0.829 -3,0 -3,0.829 -2.328,1.5 -1.5,1.5 -0.672,1.5 0,0.829 0,0"/></g><g transform="translate(19,21.5)" id="g78"><path id="path80" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.829 -0.672,-1.5 -1.5,-1.5 -2.329,-1.5 -3,-0.829 -3,0 -3,0.829 -2.329,1.5 -1.5,1.5 -0.672,1.5 0,0.829 0,0"/></g><g transform="translate(24,21.5)" id="g82"><path id="path84" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.829 -0.672,-1.5 -1.5,-1.5 -2.328,-1.5 -3,-0.829 -3,0 -3,0.829 -2.328,1.5 -1.5,1.5 -0.672,1.5 0,0.829 0,0"/></g><g transform="translate(14,21.5)" id="g86"><path id="path88" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.829 -0.672,-1.5 -1.5,-1.5 -2.328,-1.5 -3,-0.829 -3,0 -3,0.829 -2.328,1.5 -1.5,1.5 -0.672,1.5 0,0.829 0,0"/></g><path id="path90" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 27,10 -18,0 0,10.938 18,0 L 27,10 Z"/></g></g><g id="g92"><g clip-path="url(#clipPath96)" id="g94"><g transform="translate(7,21)" id="g100"><path id="path102" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.448,-1 -1,-1 -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 0.552,0 1,-0.448 1,-1"/></g><g transform="translate(31,21)" id="g104"><path id="path106" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 -0.553,0 -1,0.448 -1,1 0,0.552 0.447,1 1,1 0.553,0 1,-0.448 1,-1"/></g><g transform="translate(29,21)" id="g108"><path id="path110" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-2 c 0,-6.074 -4.925,-11 -11,-11 -6.075,0 -11,4.926 -11,11 l 0,2 -2,0 0,-2 c 0,-7.18 5.82,-13 13,-13 7.18,0 13,5.82 13,13 L 2,0 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M6 15h24v2H6zm15 15c0 2.208-.792 4-3 4-2.209 0-3-1.792-3-4s.791-2 3-2c2.208 0 3-.208 3 2z"/><path fill="#66757F" d="M18 31c-6.627 0-10 1.343-10 3v2h20v-2c0-1.657-3.373-3-10-3z"/><path fill="#99AAB5" d="M18 0c-4.971 0-9 4.029-9 9v7h18V9c0-4.971-4.029-9-9-9z"/><g fill="#292F33"><circle cx="15.5" cy="2.5" r="1.5"/><circle cx="20.5" cy="2.5" r="1.5"/><circle cx="17.5" cy="6.5" r="1.5"/><circle cx="22.5" cy="6.5" r="1.5"/><circle cx="12.5" cy="6.5" r="1.5"/><circle cx="15.5" cy="10.5" r="1.5"/><circle cx="10.5" cy="10.5" r="1.5"/><circle cx="20.5" cy="10.5" r="1.5"/><circle cx="25.5" cy="10.5" r="1.5"/><circle cx="17.5" cy="14.5" r="1.5"/><circle cx="22.5" cy="14.5" r="1.5"/><circle cx="12.5" cy="14.5" r="1.5"/></g><path fill="#66757F" d="M9 15.062V17c0 4.971 4.029 9 9 9s9-4.029 9-9v-1.938H9z"/><path fill="#66757F" d="M30 14c-.553 0-1 .448-1 1v2c0 6.074-4.925 11-11 11S7 23.074 7 17v-2c0-.552-.448-1-1-1s-1 .448-1 1v2c0 7.18 5.82 13 13 13s13-5.82 13-13v-2c0-.552-.447-1-1-1z"/></svg> \ No newline at end of file |