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/1f685.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/1f685.svg')
-rw-r--r-- | public/emoji/1f685.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f685.svg b/public/emoji/1f685.svg index cc80bc4aa..2b24d9ab3 100644 --- a/public/emoji/1f685.svg +++ b/public/emoji/1f685.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></defs><g transform="matrix(1.25,0,0,-1.25,0,45)" id="g10"><path id="path12" style="fill:#939598;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 36,0 36,2 0,2 0,0 Z"/><g id="g14"><g clip-path="url(#clipPath18)" id="g16"><g transform="translate(3,1)" id="g22"><path id="path24" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 33,0 0,29 -15,0 c -4,0 -5,-2 -5,-2 L 9,21.001 c 0,0 -12,-5 -12,-10 0,-4 6,-6 6,-6 L 0,0 Z"/></g><g transform="translate(14,1)" id="g26"><path id="path28" style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 2,3 22,3 22,0 0,0 Z"/></g><g transform="translate(0,12.001)" id="g30"><path id="path32" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-4 6,-6 6,-6 L 6,6.874 C 3,4.999 0,2.5 0,0"/></g><g transform="translate(6,6)" id="g34"><path id="path36" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,0.001 0,0 Z"/></g><g transform="translate(6,6)" id="g38"><path id="path40" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -3,-5 30,-5 30,0 0,0 Z"/></g><g transform="translate(20,6)" id="g42"><path id="path44" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 4,6 16,6 16,0 0,0 Z"/></g><g transform="translate(26,28)" id="g46"><path id="path48" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -10.001,0 -14,-5.999 -14.001,-6 -3.158,-6 c 0.476,0 1.108,0.448 1.412,1 l 2.197,4 C 0.754,-0.448 0.553,0 0,0"/></g><g transform="translate(25.9023,26)" id="g50"><path id="path52" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.549,1 C 0.852,1.552 0.65,2 0.098,2 L -9.903,2 -11.236,0 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#939598" d="M0 34h36v2H0z"/><path fill="#D1D3D4" d="M3 35h33V6H21c-4 0-5 2-5 2l-4 6S0 19 0 24c0 4 6 6 6 6l-3 5z"/><path fill="#231F20" d="M14 35l2-3h20v3z"/><path d="M0 23.999c0 4 6 6 6 6V17.125C3 19 0 21.499 0 23.999zM6 30v-.001V30z" fill="#3B88C3"/><path fill="#269" d="M6 30l-3 5h33v-5z"/><path fill="#3B88C3" d="M20 30l4-6h12v6z"/><path fill="#55ACEE" d="M26 8H16l-4 6h-.001 10.843c.477 0 1.108-.448 1.412-1l2.197-4c.303-.552.102-1-.451-1z"/><path fill="#3B88C3" d="M25.902 10l.549-1c.303-.552.102-1-.451-1H16l-1.333 2h11.235z"/></svg> \ No newline at end of file |