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/1f353.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/1f353.svg')
-rw-r--r-- | public/emoji/1f353.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f353.svg b/public/emoji/1f353.svg index 0243a55b7..26a41ee24 100644 --- a/public/emoji/1f353.svg +++ b/public/emoji/1f353.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(22.6143,1.1553)" id="g20"><path id="path22" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 3.462,1.154 6.117,3.034 6.12,9.373 0.002,4.011 4.266,8.472 4.265,12.551 -10e-4,3.921 -4.615,10.384 -15.1,9.285 -10.778,-1.128 -14.899,-4.364 -14.9,-11.438 -0.001,-4.926 5.304,-8.38 8.127,-13.517 C -9.614,2.845 -4.063,-3.342 0,0"/></g><g transform="translate(26.252,32.4277)" id="g24"><path id="path26" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.278,1.044 -3.28,1.55 -5.35,1.677 0.273,0.037 0.542,0.076 0.821,0.094 0.972,0.064 3.614,1.233 1.4,1.088 C -4.098,2.796 -5.03,2.6 -5.966,2.436 c 0.237,0.154 0.479,0.306 0.74,0.442 -0.026,0.694 -4.026,0.694 -6.045,-0.994 -0.512,0.112 -0.981,0.688 -3.981,0.688 -2,0 -4.685,-0.926 -3,-1 0.917,-0.04 2,0 1.858,-0.364 -0.655,-0.061 -3.858,-0.636 -3.858,-1.636 0,-0.353 2.76,0.174 3,0 -1.722,-0.643 -3,-2 -3,-3 0,-0.423 2.211,0.825 3,1 -1,-1 -1.4,-1.7 -1.342,-2.427 0.037,-0.475 2.387,0.09 2.632,0.169 0.822,0.27 3.71,1.258 4.6,2.724 0.117,-0.285 2.963,-1.341 4.11,-1.466 0.529,-0.058 2.62,-0.274 2.141,0.711 -0.141,0.289 -1.141,1.289 -1.446,2.264 C -6.111,-0.434 1.748,-1.428 0,0"/></g><g transform="translate(9.3389,18.6938)" id="g28"><path id="path30" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.136,1.46 -2.54,3.252 -2.331,1 -2.195,-0.459 0.209,-2.251 0,0"/></g><g transform="translate(16.7974,18.1406)" id="g32"><path id="path34" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.069,0.622 -0.282,1.191 -0.687,1.671 -0.466,0.551 -1.075,0.363 -1.234,-0.316 -0.187,-0.798 0.082,-1.751 0.606,-2.371 0.013,-0.016 0.027,-0.033 0.041,-0.048 -0.214,0.525 -0.428,1.049 -0.642,1.573 10e-4,-0.015 0.004,-0.031 0.006,-0.047 0.071,-0.64 0.397,-1.73 1.136,-1.906 C -0.02,-1.626 0.051,-0.455 0,0"/></g><g transform="translate(22.5488,22.9824)" id="g36"><path id="path38" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.476,0.955 0.17,3.962 -0.831,1.954 -1.307,0.999 -1.002,-2.008 0,0"/></g><g transform="translate(29.7598,24.439)" id="g40"><path id="path42" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.03,0.357 -0.073,0.78 -0.391,1.01 -1.189,0.858 -2.38,-2.36 -1.384,-3.08 0.019,-0.012 0.036,-0.025 0.054,-0.039 -0.11,0.307 -0.22,0.613 -0.331,0.919 0,-0.018 10e-4,-0.035 0.003,-0.052 C -2,-1.806 -1.673,-2.619 -0.965,-2.189 -0.298,-1.784 0.063,-0.746 0,0"/></g><g transform="translate(28.415,15.8721)" id="g44"><path id="path46" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.016,1.569 -0.545,3.451 -1.78,1.542 -2.796,-0.026 -1.234,-1.908 0,0"/></g><g transform="translate(22.667,12.9775)" id="g48"><path id="path50" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.173,1.937 -2.309,2.752 -2.51,0.496 -2.683,-1.441 -0.201,-2.256 0,0"/></g><g transform="translate(12.7705,14.1904)" id="g52"><path id="path54" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.017,-0.001 -0.033,-0.003 -0.049,-0.004 0.405,-0.242 0.859,-0.48 1.313,-0.719 1.307,-0.715 1.302,-0.708 1.295,-0.702 0.989,-0.422 -0.058,0.381 -0.493,-0.11 -0.933,-0.607 0.005,-1.531 0.311,-1.813 0.653,-2.127 1.239,-2.576 1.74,-2.543 3.178,-2.45 0.957,0.062 0,0"/></g><g transform="translate(25.998,8.2832)" id="g56"><path id="path58" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.969,1.066 0.725,4.05 -0.798,2.376 -1.767,1.31 -1.522,-1.674 0,0"/></g><g transform="translate(12.5986,22.2471)" id="g60"><path id="path62" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.093,0.005 0.187,0.012 0.28,0.018 0.983,0.065 1.284,1.473 1.322,1.971 1.366,2.542 1.279,3.427 0.537,3.377 0.443,3.372 0.351,3.365 0.256,3.359 -0.446,3.312 -0.747,1.905 -0.786,1.407 -0.83,0.836 -0.742,-0.05 0,0"/></g><g transform="translate(20.4453,6.9902)" id="g64"><path id="path66" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.395,-0.764 0.252,-1.623 -0.32,-1.919 -0.573,-0.296 -1.358,0.081 -1.753,0.844 -0.395,0.763 -0.252,1.623 0.32,1.919 C -1.181,1.14 -0.396,0.763 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#BE1931" d="M22.614 34.845c3.462-1.154 6.117-3.034 6.12-9.373C28.736 21.461 33 17 32.999 12.921 32.998 9 28.384 2.537 17.899 3.635 7.122 4.764 3 8 2.999 15.073c0 4.927 5.304 8.381 8.127 13.518C13 32 18.551 38.187 22.614 34.845z"/><path fill="#77B255" d="M26.252 3.572c-1.278-1.044-3.28-1.55-5.35-1.677.273-.037.542-.076.82-.094.973-.063 3.614-1.232 1.4-1.087-.969.063-1.901.259-2.837.423.237-.154.479-.306.74-.442C21 0 17 0 14.981 1.688 14.469 1.576 14 1 11 1c-2 0-4.685.926-3 1 .917.041 2 0 1.858.365C9.203 2.425 6 3 6 4c0 .353 2.76-.173 3 0-1.722.644-3 2-3 3 0 .423 2.211-.825 3-1-1 1-1.4 1.701-1.342 2.427.038.475 2.388-.09 2.632-.169.822-.27 3.71-1.258 4.6-2.724.117.285 2.963 1.341 4.11 1.466.529.058 2.62.274 2.141-.711C21 6 20 5 19.695 4.025c.446-.019 8.305.975 6.557-.453z"/><path fill="#F4ABBA" d="M9.339 17.306c-.136-1.46-2.54-3.252-2.331-1 .136 1.46 2.54 3.252 2.331 1zm7.458.553c-.069-.622-.282-1.191-.687-1.671-.466-.55-1.075-.362-1.234.316-.187.799.082 1.752.606 2.372l.041.048c-.213-.525-.427-1.05-.642-1.574l.006.047c.071.64.397 1.73 1.136 1.906.754.182.826-.988.774-1.444zm5.752-4.841c.476-.955.17-3.962-.831-1.954-.476.954-.171 3.962.831 1.954zm7.211-1.457c-.03-.357-.073-.78-.391-1.01-1.189-.858-2.381 2.359-1.385 3.08.02.012.036.025.055.039l-.331-.919c0 .018.001.035.003.052.049.564.376 1.377 1.084.948.667-.406 1.028-1.444.965-2.19zm-1.345 8.567c1.016-1.569-.545-3.451-1.78-1.542-1.016 1.568.546 3.45 1.78 1.542zm-5.748 2.894c.173-1.938-2.309-2.752-2.51-.496-.173 1.938 2.309 2.752 2.51.496zm-9.896-1.212l-.049.004 1.362.715c-.006-.004-.011-.011-.018-.017-.306-.28-1.353-1.083-1.788-.592-.44.497.498 1.421.804 1.703.342.314.928.763 1.429.73 1.437-.093-.783-2.605-1.74-2.543zm13.227 5.907c.969-1.066.725-4.05-.798-2.376-.969 1.066-.724 4.05.798 2.376zM12.599 13.753c.093-.005.187-.012.28-.019.703-.046 1.004-1.454 1.042-1.952.044-.571-.043-1.456-.785-1.407l-.281.019c-.702.047-1.004 1.454-1.042 1.952-.044.571.044 1.457.786 1.407zm7.846 15.257c.395.764.252 1.623-.32 1.919s-1.357-.081-1.753-.844c-.395-.764-.252-1.623.32-1.919.573-.296 1.357.081 1.753.844z"/></svg> \ No newline at end of file |