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/1f570.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/1f570.svg')
-rw-r--r-- | public/emoji/1f570.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f570.svg b/public/emoji/1f570.svg index 408633459..da6fd2682 100644 --- a/public/emoji/1f570.svg +++ b/public/emoji/1f570.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></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(2,7)" id="g20"><path id="path22" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,-6 8,0 c 0,0 1,2 3,2 l 6,0 0,4 -16,0 z"/></g><g transform="translate(34,7)" id="g24"><path id="path26" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 1,-6 -8,0 c 0,0 -1,2 -3,2 l -6,0 0,4 16,0 z"/></g><g transform="translate(6,16)" id="g28"><path id="path30" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1 0,-8 -4,-8 L 4,-9 0,0 Z"/></g><g transform="translate(30,16)" id="g32"><path id="path34" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1 0,-8 4,-8 L -4,-9 0,0 Z"/></g><g transform="translate(30,16)" id="g36"><path id="path38" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-6.628 -5.373,-12 -12,-12 -6.627,0 -12,5.372 -12,12 0,6.627 5.373,12 12,12 C -5.373,12 0,6.627 0,0"/></g><g transform="translate(10,1)" id="g40"><path id="path42" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.448,-1 -1,-1 l -8,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 l 8,0 C -0.448,1 0,0.553 0,0"/></g><g transform="translate(36,1)" id="g44"><path id="path46" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -8,0 c -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 l 8,0 C -0.447,1 0,0.553 0,0"/></g><g transform="translate(35,7)" id="g48"><path id="path50" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -32,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L -1,1 C -0.447,1 0,0.553 0,0"/></g><g transform="translate(27,16)" id="g52"><path id="path54" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.971 -4.03,-9 -9,-9 -4.971,0 -9,4.029 -9,9 0,4.97 4.029,8.999 9,8.999 4.97,0 9,-4.029 9,-8.999"/></g><g transform="translate(26,16)" id="g56"><path id="path58" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.418 -3.582,-8 -8,-8 -4.419,0 -8,3.582 -8,8 0,4.418 3.581,7.999 8,7.999 4.418,0 8,-3.581 8,-7.999"/></g><g transform="translate(18,16)" id="g60"><path id="path62" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -0.119,-1 -1.5,-1 -2.881,-1 -5,0 -5,0 -5,0 -2.881,1 -1.5,1 -0.119,1 0,0 0,0"/></g><g transform="translate(19,19.4995)" id="g64"><path id="path66" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.933 -0.448,-3.499 -1,-3.499 -0.552,0 -1,1.566 -1,3.499 0,1.933 1,3.5 1,3.5 C -1,3.501 0,1.933 0,0"/></g><g transform="translate(18.5864,16)" id="g68"><path id="path70" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.324 -0.263,-0.586 -0.586,-0.586 -0.324,0 -0.587,0.262 -0.587,0.586 0,0.324 0.263,0.586 0.587,0.586 C -0.263,0.586 0,0.324 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#662113" d="M2 29l-1 6h8s1-2 3-2h6v-4H2zm32 0l1 6h-8s-1-2-3-2h-6v-4h16zM6 20c0 1 0 8-4 8l8 1-4-9zm24 0c0 1 0 8 4 8l-8 1 4-9z"/><path fill="#662113" d="M30 20c0 6.628-5.373 12-12 12S6 26.628 6 20c0-6.627 5.373-12 12-12s12 5.373 12 12z"/><path fill="#A0041E" d="M10 35c0 .553-.448 1-1 1H1c-.552 0-1-.447-1-1 0-.553.448-1 1-1h8c.552 0 1 .447 1 1zm26 0c0 .553-.447 1-1 1h-8c-.553 0-1-.447-1-1 0-.553.447-1 1-1h8c.553 0 1 .447 1 1zm-1-6c0 .553-.447 1-1 1H2c-.552 0-1-.447-1-1 0-.553.448-1 1-1h32c.553 0 1 .447 1 1z"/><path fill="#FFAC33" d="M27 20c0 4.971-4.03 9-9 9-4.971 0-9-4.029-9-9 0-4.97 4.029-9 9-9 4.97 0 9 4.03 9 9z"/><path fill="#F5F8FA" d="M26 20c0 4.418-3.582 8-8 8s-8-3.582-8-8 3.582-8 8-8 8 3.582 8 8z"/><path fill="#C1694F" d="M18 20s-.119 1-1.5 1-3.5-1-3.5-1 2.119-1 3.5-1 1.5 1 1.5 1z"/><path fill="#C1694F" d="M19 16.5c0 1.933-.448 3.5-1 3.5s-1-1.566-1-3.5 1-3.499 1-3.499c0-.001 1 1.566 1 3.499z"/><circle fill="#662113" cx="18" cy="20" r=".586"/></svg> \ No newline at end of file |