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/1f488.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/1f488.svg')
| -rw-r--r-- | public/emoji/1f488.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f488.svg b/public/emoji/1f488.svg index e9ae2255c..33ed33287 100644 --- a/public/emoji/1f488.svg +++ b/public/emoji/1f488.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="clipPath16" clipPathUnits="userSpaceOnUse"><path id="path18" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath30" clipPathUnits="userSpaceOnUse"><path id="path32" d="m 11,3 14,0 0,21.001 -14,0 L 11,3 Z"/></clipPath><clipPath id="clipPath62" clipPathUnits="userSpaceOnUse"><path id="path64" 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"><g id="g12"><g clip-path="url(#clipPath16)" id="g14"><g transform="translate(24,30)" id="g20"><path id="path22" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.313 -2.686,-6 -6,-6 -3.314,0 -6,2.687 -6,6 0,3.313 2.686,6 6,6 3.314,0 6,-2.687 6,-6"/></g><path id="path24" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 25,3 11,3 11,24 25,24 25,3 Z"/></g></g><g id="g26"><g clip-path="url(#clipPath30)" id="g28"><g transform="translate(33.1914,14.4902)" id="g34"><path id="path36" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -23.368,11.399 1.755,3.596 L 1.754,3.595 0,0 Z"/></g><g transform="translate(26.1758,0.1094)" id="g38"><path id="path40" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -23.367,11.4 1.753,3.595 L 1.754,3.596 0,0 Z"/></g><g transform="translate(31.4375,10.8945)" id="g42"><path id="path44" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -23.367,11.401 1.753,3.594 L 1.754,3.596 0,0 Z"/></g><g transform="translate(27.9297,3.7051)" id="g46"><path id="path48" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -23.368,11.399 1.755,3.596 L 1.754,3.595 0,0 Z"/></g><g transform="translate(24.4219,-3.4854)" id="g50"><path id="path52" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -23.367,11.4 1.754,3.595 L 1.754,3.595 0,0 Z"/></g><g transform="translate(29.6836,7.2998)" id="g54"><path id="path56" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -23.367,11.4 1.754,3.596 L 1.754,3.595 0,0 Z"/></g></g></g><g id="g58"><g clip-path="url(#clipPath62)" id="g60"><g transform="translate(27,25)" id="g66"><path id="path68" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -14,0 c -1.104,0 -2,0.896 -2,2 0,1.104 0.896,2 2,2 L -2,2 C -0.895,2 0,1.104 0,0"/></g><g transform="translate(27,2)" id="g70"><path id="path72" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.895,-2 -2,-2 l -14,0 c -1.104,0 -2,0.895 -2,2 0,1.105 0.896,2 2,2 L -2,2 C -0.895,2 0,1.105 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><circle fill="#CCD6DD" cx="18" cy="6" r="6"/><path fill="#FFF" d="M11 12h14v21H11z"/><path fill="#DD2E44" d="M11 28.487L20.251 33H25v-2.134l-14-6.83z"/><path fill="#55ACEE" d="M11 19.585l14 6.83v-4.45l-14-6.831z"/><path fill="#DD2E44" d="M13.697 12L25 17.514V12z"/><path fill="#99AAB5" d="M27 11c0 1.104-.896 2-2 2H11c-1.104 0-2-.896-2-2s.896-2 2-2h14c1.104 0 2 .896 2 2zm0 23c0 1.104-.896 2-2 2H11c-1.104 0-2-.896-2-2s.896-2 2-2h14c1.104 0 2 .896 2 2z"/></svg> \ No newline at end of file |
