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/1f6f8.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/1f6f8.svg')
-rw-r--r-- | public/emoji/1f6f8.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f6f8.svg b/public/emoji/1f6f8.svg index 5cc00c6a0..5f015fe79 100644 --- a/public/emoji/1f6f8.svg +++ b/public/emoji/1f6f8.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(32.8311,15.5751)" id="g20"><path id="path22" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.689,-3.241 -9.21,-6.221 -17.314,-4.499 -8.103,1.723 -14.676,7.911 -13.987,11.152 0.689,3.241 8.587,3.287 16.69,1.564 C -6.508,6.495 0.689,3.241 0,0"/></g><g transform="translate(27,0)" id="g24"><path id="path26" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2,14 -19,19 -27,0 0,0 Z"/></g><g transform="translate(34.1095,16.78)" id="g28"><path id="path30" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.868,-4.082 -9.016,-5.808 -18.199,-3.856 -9.184,1.952 -15.926,6.843 -15.058,10.925 0.868,4.082 9.016,5.808 18.199,3.856 C -5.874,8.973 0.868,4.082 0,0"/></g><g transform="translate(0.4142,25.023)" id="g32"><path id="path34" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.414,-2.315 33.28,-9.301 34.692,-7.175 0,0 Z"/></g><g transform="translate(35.619,19.0718)" id="g36"><path id="path38" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.919,-4.322 -9.546,-6.15 -19.27,-4.083 -9.724,2.067 -16.862,7.246 -15.943,11.568 0.918,4.322 9.546,6.149 19.27,4.083 C -6.219,9.501 0.919,4.322 0,0"/></g><g transform="translate(33.1004,21.6519)" id="g40"><path id="path42" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.689,-3.241 -7.816,-4.473 -15.92,-2.75 -8.103,1.722 -14.113,5.746 -13.424,8.987 0.689,3.242 7.816,4.473 15.919,2.751 C -5.322,7.265 0.689,3.241 0,0"/></g><g transform="translate(10.0407,28.5981)" id="g44"><path id="path46" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.344,1.621 4.565,2.097 9.427,1.063 14.289,0.03 17.951,-2.122 17.607,-3.742 17.262,-5.363 13.042,-5.839 8.18,-4.806 3.318,-3.772 -0.344,-1.621 0,0"/></g><g transform="translate(10.0407,28.5981)" id="g48"><path id="path50" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.344,1.621 2.996,4.475 9.843,3.02 16.69,1.564 17.951,-2.122 17.607,-3.742 17.262,-5.363 13.042,-5.839 8.18,-4.806 3.318,-3.772 -0.344,-1.621 0,0"/></g><g transform="translate(15.7867,17.1533)" id="g52"><path id="path54" style="fill:#8ccaf7;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.115,0.54 0.646,0.885 1.186,0.77 1.726,0.655 2.071,0.124 1.956,-0.416 1.841,-0.956 1.31,-1.301 0.77,-1.186 0.23,-1.071 -0.115,-0.54 0,0"/></g><g transform="translate(23.8198,16.4681)" id="g56"><path id="path58" style="fill:#8ccaf7;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.115,0.54 0.646,0.885 1.186,0.77 1.726,0.655 2.071,0.124 1.956,-0.416 1.841,-0.956 1.31,-1.301 0.77,-1.186 0.23,-1.071 -0.115,-0.54 0,0"/></g><g transform="translate(31.2906,17.9472)" id="g60"><path id="path62" style="fill:#8ccaf7;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.115,0.54 0.646,0.885 1.186,0.77 1.726,0.655 2.071,0.124 1.956,-0.416 1.841,-0.956 1.31,-1.301 0.77,-1.186 0.23,-1.071 -0.115,-0.54 0,0"/></g><g transform="translate(33.4074,22.5649)" id="g64"><path id="path66" style="fill:#8ccaf7;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.174,0.214 0.663,0.105 1.091,-0.244 1.519,-0.593 1.725,-1.05 1.55,-1.264 1.376,-1.478 0.887,-1.368 0.459,-1.019 0.031,-0.67 -0.174,-0.214 0,0"/></g><g transform="translate(3.7672,28.8651)" id="g68"><path id="path70" style="fill:#8ccaf7;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.072,0.267 -0.563,0.365 -1.096,0.221 -1.629,0.076 -2.002,-0.257 -1.93,-0.524 -1.858,-0.79 -1.367,-0.889 -0.834,-0.745 -0.301,-0.6 0.072,-0.266 0,0"/></g><g transform="translate(1.9462,24.1845)" id="g72"><path id="path74" style="fill:#8ccaf7;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.115,0.54 0.646,0.885 1.186,0.77 1.726,0.655 2.071,0.124 1.956,-0.416 1.841,-0.956 1.31,-1.301 0.77,-1.186 0.23,-1.071 -0.115,-0.54 0,0"/></g><g transform="translate(8.1695,19.7947)" id="g76"><path id="path78" style="fill:#8ccaf7;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.115,0.54 0.646,0.885 1.186,0.77 1.726,0.655 2.071,0.124 1.956,-0.416 1.841,-0.956 1.31,-1.301 0.77,-1.186 0.23,-1.071 -0.115,-0.54 0,0"/></g><g transform="translate(14.681,31.1899)" id="g80"><path id="path82" style="fill:#8ccaf7;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.172,0.81 2.502,1.002 5.203,0.428 7.904,-0.146 9.954,-1.269 9.781,-2.079 9.609,-2.889 7.28,-3.081 4.579,-2.507 1.878,-1.933 -0.172,-0.81 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFD983" d="M32.831 20.425c-.689 3.241-9.21 6.221-17.314 4.499S.841 17.013 1.53 13.772s8.587-3.287 16.69-1.564 15.3 4.976 14.611 8.217z"/><path fill="#FFD983" d="M27 36l-2-14-17-5-8 19z"/><ellipse transform="rotate(-78 17.482 15.686)" fill="#67757F" cx="17.481" cy="15.685" rx="7.556" ry="17"/><path fill="#67757F" d="M.414 10.977l.414 2.315 32.866 6.986 1.412-2.126z"/><ellipse transform="rotate(-78 18.013 13.186)" fill="#9AAAB4" cx="18.012" cy="13.186" rx="8" ry="18"/><ellipse transform="rotate(-78 18.43 11.23)" fill="#CCD6DD" cx="18.428" cy="11.229" rx="6" ry="15"/><ellipse transform="rotate(-78 18.845 9.274)" fill="#E1E8ED" cx="18.844" cy="9.273" rx="3" ry="9"/><path fill="#5DADEC" d="M10.041 7.402c.344-1.621 2.996-4.475 9.843-3.02s8.108 5.141 7.764 6.762c-.344 1.621-4.565 2.097-9.427 1.063s-8.525-3.184-8.18-4.805z"/><circle fill="#8CCAF7" cx="16.765" cy="19.055" r="1"/><circle fill="#8CCAF7" cx="24.798" cy="19.74" r="1"/><circle fill="#8CCAF7" cx="32.269" cy="18.261" r="1"/><ellipse transform="rotate(-50.811 34.182 14.066)" fill="#8CCAF7" cx="34.183" cy="14.067" rx=".5" ry="1"/><ellipse transform="rotate(-15.188 2.802 7.396)" fill="#8CCAF7" cx="2.802" cy="7.397" rx="1" ry=".5"/><circle fill="#8CCAF7" cx="2.924" cy="12.023" r="1"/><circle fill="#8CCAF7" cx="9.148" cy="16.413" r="1"/><ellipse transform="rotate(-78 19.573 5.85)" fill="#8CCAF7" cx="19.572" cy="5.85" rx="1.5" ry="5"/></svg> \ No newline at end of file |