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/1f458.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/1f458.svg')
-rw-r--r-- | public/emoji/1f458.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f458.svg b/public/emoji/1f458.svg index 6917bbc77..7c955e99e 100644 --- a/public/emoji/1f458.svg +++ b/public/emoji/1f458.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="clipPath30" clipPathUnits="userSpaceOnUse"><path id="path32" 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 transform="translate(21.9996,36)" id="g12"><path id="path14" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2,-10.577 4.001,-27 l 9,0.885 L 8,-2.808 3.001,0 0,0 Z"/></g><g transform="translate(10.9998,36)" id="g16"><path id="path18" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4.999,-2.808 -10,-26.115 -1,-27 5,-10.577 3.001,0 0,0 Z"/></g><path id="path20" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 11,0 25,0 25,31 11,31 11,0 Z"/><g transform="translate(17.9849,27.2388)" id="g22"><path id="path24" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -6.985,-5.239 2,0 5.094,5.094 L 0,0 Z"/></g><g id="g26"><g clip-path="url(#clipPath30)" id="g28"><g transform="translate(25,16)" id="g34"><path id="path36" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -1.167,-1 -7,-1 -5.833,0 -7,1 -7,1 l 0,6 14,0 0,-6 z"/></g><g transform="translate(25,18)" id="g38"><path id="path40" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -1.167,-1 -7,-1 -5.833,0 -7,1 -7,1 l 0,2 7,0 7,0 0,-2 z"/></g><g transform="translate(25,36)" id="g42"><path id="path44" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -7,-9 -14,0 0,0 Z"/></g><g transform="translate(20.333,36)" id="g46"><path id="path48" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2.333,-3 -4.666,0 0,0 Z"/></g><g transform="translate(25,11)" id="g50"><path id="path52" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,21 2,-2 0,0 Z"/></g><g transform="translate(11,11)" id="g54"><path id="path56" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,21 -2,-2 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#3B88C3" d="M22 0h3l5 2.808 5 23.307L26 27l-6-16.423M14 0h-3L6 2.808 1 26.115 10 27l6-16.423"/><path fill="#3B88C3" d="M11 5h14v31H11z"/><path fill="#269" d="M17.985 8.761L11 14h2l5.094-5.094z"/><path fill="#88C9F9" d="M25 20s-1.167 1-7 1-7-1-7-1v-6h14v6z"/><path fill="#FFF" d="M25 18s-1.167 1-7 1-7-1-7-1v-2h14v2zm0-18l-7 9-7-9z"/><path fill="#99AAB5" d="M20.333 0L18 3l-2.333-3z"/><path fill="#269" d="M25 25V4l2 23zm-14 0V4L9 27z"/></svg> \ No newline at end of file |