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/26f2.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/26f2.svg')
-rw-r--r-- | public/emoji/26f2.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/26f2.svg b/public/emoji/26f2.svg index b12362cbf..659c22850 100644 --- a/public/emoji/26f2.svg +++ b/public/emoji/26f2.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 4,36 C 1.791,36 0,34.209 0,32 L 0,32 0,4 C 0,1.791 1.791,0 4,0 l 0,0 28,0 c 2.209,0 4,1.791 4,4 l 0,0 0,28 c 0,2.209 -1.791,4 -4,4 l 0,0 -28,0 z"/></clipPath><clipPath id="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath50" clipPathUnits="userSpaceOnUse"><path id="path52" d="M 7,12 C 7,9.791 11.925,8 18,8 l 0,0 c 6.075,0 11,1.791 11,4 l 0,0 c 0,2.209 -4.925,4 -11,4 l 0,0 C 11.925,16 7,14.209 7,12"/></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"><path id="path20" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,-2 -38,0 0,38 38,0 0,-38 z"/><path id="path22" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 38,14 -39,0 0,-17 39,0 0,17 z"/></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g transform="translate(31,7)" id="g32"><path id="path34" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.762 -5.82,-5 -13,-5 -7.18,0 -13,2.238 -13,5 0,2.762 5.82,5 13,5 C -5.82,5 0,2.762 0,0"/></g><path id="path36" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 31,12 5,12 5,7 31,7 31,12 Z"/><g transform="translate(31,12)" id="g38"><path id="path40" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.762 -5.82,-5 -13,-5 -7.18,0 -13,2.238 -13,5 0,2.762 5.82,5 13,5 C -5.82,5 0,2.762 0,0"/></g><g transform="translate(29,12)" id="g42"><path id="path44" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -4.925,-4 -11,-4 -6.075,0 -11,1.791 -11,4 0,2.209 4.925,4 11,4 C -4.925,4 0,2.209 0,0"/></g></g></g><g id="g46"><g clip-path="url(#clipPath50)" id="g48"><g transform="translate(29,10)" id="g54"><path id="path56" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -4.925,-4 -11,-4 -6.075,0 -11,1.791 -11,4 0,2.209 4.925,4 11,4 C -4.925,4 0,2.209 0,0"/></g></g></g><g id="g58"><g clip-path="url(#clipPath62)" id="g60"><g transform="translate(21,10)" id="g66"><path id="path68" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -1.343,-1 -3,-1 -1.657,0 -3,0.447 -3,1 0,0.553 1.343,1 3,1 1.657,0 3,-0.447 3,-1"/></g><path id="path70" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 21,12 -6,0 0,-2 6,0 0,2 z"/><g transform="translate(21,12)" id="g72"><path id="path74" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -1.343,-1 -3,-1 -1.657,0 -3,0.447 -3,1 0,0.553 1.343,1 3,1 1.657,0 3,-0.447 3,-1"/></g><g transform="translate(22.5,30.5)" id="g76"><path id="path78" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.623,0 -2.799,-0.501 -3.638,-1.228 -4.069,0.866 -5.611,3.5 -9.5,3.5 c -4.746,0 -6,-3.925 -6,-6 l 0,-2 c 0,-0.552 0.448,-1 1,-1 0.552,0 1,0.448 1,1 l 0,2 c 0,0.163 0.045,4 4,4 3.853,0 3.997,-3.595 4,-4 l 0,-2.176 C -6.147,-4.261 -6.972,-4 -8,-4 c -3.302,0 -4.5,-2.691 -4.5,-4.5 l 0,-1 c 0,-0.552 0.448,-1 1,-1 0.552,0 1,0.448 1,1 l 0,0.994 c 0.005,0.418 0.152,2.506 2.5,2.506 2.348,0 2.495,-2.088 2.5,-2.5 l 0,-9 c 0,-0.553 0.448,-1 1,-1 0.552,0 1,0.447 1,1 l 0,7 c 0,0.334 0.097,2 2,2 1.826,0 1.992,-1.537 2,-2 l 0,-1 c 0,-0.552 0.447,-1 1,-1 0.553,0 1,0.448 1,1 l 0,1 c 0,1.608 -1.065,4 -4,4 -0.807,0 -1.459,-0.191 -2,-0.486 l 0,1.486 c 0,0.358 0.099,3.5 3.5,3.5 3.367,0 3.496,-3.146 3.5,-3.5 l 0,-2 c 0,-0.552 0.447,-1 1,-1 0.553,0 1,0.448 1,1 l 0,2 C 5.5,-3.598 4.351,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#99AAB5" d="M1 22.923v6.538C1 33.073 8.611 36 18 36s17-2.927 17-6.538v-6.538H1z"/><ellipse fill="#E1E8ED" cx="18" cy="22.923" rx="17" ry="6.538"/><path fill="#AAB8C2" d="M18 20.308c6.7 0 12.314 1.668 13.913 3.923.297-.419.472-.855.472-1.308 0-2.889-6.44-5.231-14.385-5.231S3.615 20.034 3.615 22.923c0 .452.175.889.472 1.308C5.686 21.976 11.3 20.308 18 20.308z"/><ellipse fill="#3B88C3" cx="18" cy="24.231" rx="13.913" ry="3.923"/><path fill="#50A5E6" d="M18 22.128c-4.497 0-9.625 1.285-9.625 2.103 0 .818 5.129 2.102 9.625 2.102s9.625-1.284 9.625-2.102c0-.818-5.128-2.103-9.625-2.103z"/><path fill="#E1E8ED" d="M15 22.615V24c0 .553 1.343 1 3 1s3-.447 3-1v-1.385h-6z"/><ellipse fill="#AAB8C2" cx="18" cy="22.615" rx="3" ry="1"/><path fill="#1C6399" d="M9 15.786c-.552 0-1-.448-1-1V13.5C8 10.467 10.467 8 13.5 8s5.5 2.467 5.5 5.5c0 .552-.447 1-1 1-.552 0-1-.448-1-1 0-1.93-1.57-3.5-3.5-3.5S10 11.57 10 13.5v1.286c0 .552-.448 1-1 1z"/><path fill="#88C9F9" d="M26 18c-.553 0-1-.448-1-1v-1.143c0-1.654-1.346-3-3-3s-3 1.346-3 3c0 .552-.447 1-1 1-.552 0-1-.448-1-1 0-2.757 2.243-5 5-5s5 2.243 5 5V17c0 .552-.447 1-1 1z"/><path fill="#1C6399" d="M32 11.125c-.553 0-1-.448-1-1 0-3.309-2.691-6-6-6s-6 2.691-6 6c0 .552-.447 1-1 1-.552 0-1-.448-1-1 0-4.411 3.589-8 8-8s8 3.589 8 8c0 .552-.447 1-1 1z"/><path fill="#3B94D9" d="M17 22.659h2V8c0-4.411-3.589-8-8-8S3 3.589 3 8c0 .552.448 1 1 1s1-.448 1-1c0-3.309 2.691-6 6-6s6 2.691 6 6v14.659z"/><circle fill="#1C6399" cx="32" cy="14" r="1"/><circle fill="#BBDDF5" cx="26" cy="21" r="1"/><circle fill="#BBDDF5" cx="33" cy="2" r="1"/><circle fill="#F2F9FF" cx="14" cy="20" r="1"/><circle fill="#50A5E6" cx="26" cy="9" r="1"/><circle fill="#1C6399" cx="20" cy="1" r="1"/><circle fill="#1C6399" cx="9" cy="18" r="1"/><circle fill="#3B94D9" cx="4" cy="13" r="1"/><circle fill="#88C9F9" cx="11" cy="5" r="1"/></svg> \ No newline at end of file |