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/1f368.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/1f368.svg')
-rw-r--r-- | public/emoji/1f368.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f368.svg b/public/emoji/1f368.svg index 693e2afe7..187b2f4c9 100644 --- a/public/emoji/1f368.svg +++ b/public/emoji/1f368.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="clipPath44" clipPathUnits="userSpaceOnUse"><path id="path46" d="m 18.917,23 -1.174,0 -1.175,0 -10.569,0 C 4.824,23 2.26,22.507 2.928,20.105 l 0,0 C 5.71,10.1 16,7.375 16,7.375 l 0,0 0,-1.173 c 0,0 -4.634,-2.444 -5.588,-3.01 l 0,0 C 9.385,2.605 10.145,1.666 10.556,1.504 l 0,0 c 0.684,-0.269 2.39,-1.15 7.115,-1.15 l 0,0 c 4.848,0 7.497,0.954 8.084,1.15 l 0,0 c 0.226,0.075 1.197,0.973 -0.199,1.799 l 0,0 C 23.073,4.773 20,6.202 20,6.202 l 0,0 0,1.173 c 0,0 10.661,2.725 13.357,12.906 l 0,0 C 33.753,21.775 31.837,23 29.488,23 l 0,0 -10.571,0 z"/></clipPath><clipPath id="clipPath56" clipPathUnits="userSpaceOnUse"><path id="path58" 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(20,7.375)" id="g20"><path id="path22" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 10.661,2.725 13.356,12.905 0.397,1.495 -1.518,2.72 -3.868,2.72 l -10.571,0 -1.174,0 -1.175,0 -10.568,0 c -1.176,0 -3.74,-0.493 -3.072,-2.895 C -14.289,2.725 -4,0 -4,0 l 0,-1.173 c 0,0 -4.634,-2.443 -5.588,-3.01 -1.027,-0.587 -0.267,-1.526 0.144,-1.688 0.684,-0.27 2.389,-1.15 7.115,-1.15 4.848,0 7.497,0.954 8.084,1.15 0.226,0.075 1.197,0.973 -0.198,1.799 C 3.073,-2.602 0,-1.173 0,-1.173 L 0,0 Z"/></g><g transform="translate(33.291,20.752)" id="g24"><path id="path26" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.692 -6.835,-3.063 -15.269,-3.063 -8.432,0 -15.268,1.371 -15.268,3.063 0,1.693 6.836,3.064 15.268,3.064 C -6.835,3.064 0,1.693 0,0"/></g><g transform="translate(25.9824,29.0918)" id="g28"><path id="path30" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.613 -3.133,-4.745 -7.832,-4.745 -4.325,0 -7.831,2.088 -7.831,4.745 0,4.325 3.506,6.787 7.831,6.787 C -3.506,6.787 0,4.325 0,0"/></g><g transform="translate(33.291,21.7832)" id="g32"><path id="path34" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.613 -3.132,-4.223 -7.83,-4.223 -4.326,0 -7.833,-1.393 -7.833,4.223 0,4.325 3.507,7.831 7.833,7.831 C -3.505,7.831 0,4.325 0,0"/></g><g transform="translate(18.6724,21.7832)" id="g36"><path id="path38" style="fill:#8a4b38;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-5.182 -3.132,-4.311 -7.831,-4.311 -4.324,0 -7.83,1.654 -7.83,4.311 0,4.325 3.506,7.831 7.83,7.831 C -3.506,7.831 0,4.325 0,0"/></g></g></g><g id="g40"><g clip-path="url(#clipPath44)" id="g42"><g transform="translate(2.75,18.7773)" id="g48"><path id="path50" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.915,-0.609 16.185,-5.264 31.281,0.523 31.368,-0.304 31.062,-3.22 29.845,-3.436 28.627,-3.653 15.613,-7.933 1.083,-3.235 0.691,-2.8 0,0 0,0"/></g></g></g><g id="g52"><g clip-path="url(#clipPath56)" id="g54"><g transform="translate(2.8369,20.8228)" id="g60"><path id="path62" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.396,-0.6 15.488,-5.046 30.498,-0.087 0,-0.653 -0.411,-2.477 -0.653,-3.176 C 29.454,-4.395 14.444,-8.092 0.957,-3.524 0.565,-3.35 -0.609,0.261 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#55ACEE" d="M20 28.625S30.661 25.9 33.356 15.72c.396-1.495-1.518-2.72-3.868-2.72H5.999c-1.175 0-3.74.493-3.072 2.894C5.711 25.9 16 28.625 16 28.625v1.173s-4.634 2.443-5.588 3.01c-1.027.588-.268 1.526.144 1.689.684.269 2.39 1.15 7.116 1.15 4.847 0 7.497-.954 8.083-1.15.226-.075 1.197-.973-.198-1.799-2.484-1.47-5.557-2.9-5.557-2.9v-1.173z"/><path fill="#3B88C3" d="M33.291 15.248c0 1.692-6.835 3.064-15.269 3.064-8.432 0-15.268-1.371-15.268-3.064s6.836-3.064 15.268-3.064c8.434 0 15.269 1.371 15.269 3.064z"/><path fill="#F4ABBA" d="M25.982 6.908c0 1.613-3.133 4.745-7.832 4.745-4.325 0-7.831-2.088-7.831-4.745 0-4.325 3.505-6.787 7.831-6.787 4.327.001 7.832 2.462 7.832 6.787z"/><path fill="#FFE8B6" d="M33.291 14.217c0 1.613-3.132 4.223-7.83 4.223-4.326 0-7.832 1.393-7.832-4.223 0-4.325 3.506-7.831 7.832-7.831 4.325 0 7.83 3.506 7.83 7.831z"/><path fill="#8A4B38" d="M18.672 14.217c0 5.182-3.132 4.311-7.831 4.311-4.325 0-7.831-1.653-7.831-4.311 0-4.325 3.506-7.831 7.831-7.831 4.326 0 7.831 3.506 7.831 7.831z"/><path fill="#3B88C3" d="M30.837 21.098c.824-1.161 1.541-2.487 2.082-3.995-13.485 4.732-26.07 1.375-29.477.336.49 1.279 1.103 2.425 1.797 3.446 11.35 3.251 21.551 1.204 25.598.213z"/><path fill="#55ACEE" d="M2.837 15.177c1.396.6 15.488 5.046 30.498.087 0 .652-.411 2.477-.653 3.175-.391 1.132-15.401 4.83-28.888.261-.392-.173-1.566-3.784-.957-3.523z"/></svg> \ No newline at end of file |