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/1f369.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/1f369.svg')
-rw-r--r-- | public/emoji/1f369.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f369.svg b/public/emoji/1f369.svg index ae1d58f02..3c2aa5826 100644 --- a/public/emoji/1f369.svg +++ b/public/emoji/1f369.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(35.3369,12.4512)" id="g20"><path id="path22" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.046,-6.271 -7.722,-10.451 -17.245,-10.451 -9.523,0 -16.198,4.18 -17.243,10.451 -0.247,1.479 0.156,8.12 1.054,9.406 2.559,3.663 3.474,-10.365 16.189,-10.365 13.848,0 13.641,14.028 16.199,10.365 C -0.147,8.12 0.246,1.479 0,0"/></g><g transform="translate(18.0923,16.6309)" id="g24"><path id="path26" style="fill:#8a4b38;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.174,0 -5.748,0.702 -5.748,1.568 0,0.866 2.574,1.567 5.748,1.567 3.173,0 5.747,-0.701 5.747,-1.567 C 5.747,0.702 3.173,0 0,0 m 0,13.374 c -9.331,0 -16.895,-4.584 -16.895,-10.239 0,-5.655 7.564,-10.24 16.895,-10.24 9.33,0 16.895,4.585 16.895,10.24 C 16.895,8.79 9.33,13.374 0,13.374"/></g><g transform="translate(1.7197,21.3774)" id="g28"><path id="path30" style="fill:#8a4b38;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.653,-1.045 -0.92,-5.494 0.479,-7.577 2.134,-3.179 3.178,-1.567 4.746,-2.046 2.335,-0.715 2.508,-2.56 4.355,-3.484 2.09,-1.045 3.305,-0.741 6.27,0 4.181,1.045 6.837,-1.088 9.405,0 2.106,0.893 3.311,4.137 4.486,4.528 3.728,1.243 4.515,7.125 1.741,9.538 -0.87,-1.83 -5.137,-8.405 -7.88,-8.71 -2.745,-0.305 -10.974,-1 -14.457,0.784 C 5.661,-5.182 2.134,-2.961 1.698,-2.352 1.263,-1.742 0,0 0,0"/></g><g transform="translate(18.0923,22.1177)" id="g32"><path id="path34" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.752,0 -6.793,-1.228 -6.793,-2.743 0,-0.59 0.463,-1.134 1.245,-1.58 -0.126,0.13 -0.2,0.264 -0.2,0.404 0,0.866 2.574,1.567 5.748,1.567 3.173,0 5.747,-0.701 5.747,-1.567 0,-0.14 -0.073,-0.274 -0.2,-0.404 0.783,0.446 1.246,0.99 1.246,1.58 C 6.793,-1.228 3.751,0 0,0"/></g><g transform="translate(4.4199,17.8496)" id="g36"><path id="path38" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.375,0 -0.737,0.203 -0.925,0.557 -1.195,1.067 -1,1.7 -0.489,1.969 L 1.819,3.19 C 2.328,3.461 2.961,3.265 3.231,2.754 3.501,2.244 3.306,1.611 2.795,1.342 L 0.487,0.122 C 0.332,0.039 0.165,0 0,0"/></g><g transform="translate(16.3071,10.0557)" id="g40"><path id="path42" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.41,0 -0.799,0.242 -0.966,0.646 l -0.74,1.786 C -1.927,2.965 -1.673,3.576 -1.14,3.797 -0.606,4.017 0.004,3.765 0.225,3.23 L 0.965,1.444 C 1.186,0.911 0.933,0.3 0.399,0.079 0.269,0.025 0.133,0 0,0"/></g><g transform="translate(28.1514,14.2363)" id="g44"><path id="path46" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.181,0 -0.364,0.047 -0.53,0.146 -1.027,0.439 -1.192,1.08 -0.898,1.576 L 0.233,3.492 C 0.526,3.988 1.171,4.153 1.664,3.86 2.161,3.566 2.326,2.926 2.032,2.429 L 0.9,0.514 C 0.706,0.184 0.357,0 0,0"/></g><g transform="translate(29.8926,22)" id="g48"><path id="path50" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.56,0 -1.023,0.481 -1.043,1.046 -0.02,0.576 0.431,1.079 1.007,1.1 L 1.182,2.198 C 1.769,2.205 2.243,1.771 2.263,1.194 2.283,0.618 1.832,0.099 1.256,0.078 L 0.038,0 0,0 Z"/></g><g transform="translate(19.792,26.1235)" id="g52"><path id="path54" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.444,0 -0.855,0.285 -0.997,0.73 -0.173,0.551 0.132,1.138 0.682,1.312 L 0.511,2.303 C 1.066,2.478 1.648,2.172 1.822,1.622 1.997,1.071 1.691,0.484 1.142,0.31 L 0.315,0.049 C 0.21,0.016 0.104,0 0,0"/></g><g transform="translate(13.9976,24.4258)" id="g56"><path id="path58" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.157,0 -0.316,0.036 -0.466,0.11 L -1.25,0.502 C -1.766,0.76 -1.976,1.388 -1.718,1.904 -1.46,2.42 -0.832,2.63 -0.316,2.372 L 0.468,1.98 C 0.984,1.722 1.194,1.095 0.936,0.578 0.753,0.212 0.384,0 0,0"/></g><g transform="translate(23.0996,11.1465)" id="g60"><path id="path62" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.156,0 -0.315,0.035 -0.465,0.109 L -1.249,0.5 c -0.517,0.258 -0.727,0.885 -0.47,1.401 0.257,0.518 0.884,0.727 1.402,0.47 L 0.467,1.98 C 0.983,1.723 1.193,1.096 0.937,0.579 0.754,0.212 0.384,0 0,0"/></g><g transform="translate(9.4263,13.4521)" id="g64"><path id="path66" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.138,0 -0.277,0.026 -0.412,0.085 -0.53,0.227 -0.775,0.842 -0.548,1.372 l 0.392,0.914 C -0.34,2.9 0.275,3.15 0.805,2.919 1.335,2.691 1.581,2.077 1.353,1.547 L 0.961,0.633 C 0.791,0.237 0.405,0 0,0"/></g><g transform="translate(25.0176,23.3369)" id="g68"><path id="path70" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.403,0 -0.787,0.234 -0.958,0.626 -0.231,0.529 0.01,1.145 0.538,1.377 L 0.276,2.308 C 0.807,2.54 1.422,2.298 1.652,1.769 1.884,1.24 1.643,0.624 1.114,0.393 L 0.418,0.088 C 0.281,0.028 0.14,0 0,0"/></g><g transform="translate(8.0347,23.3804)" id="g72"><path id="path74" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.078,0 -0.157,0.009 -0.235,0.027 l -0.566,0.13 c -0.563,0.13 -0.914,0.691 -0.784,1.253 0.129,0.563 0.691,0.913 1.252,0.784 L 0.233,2.064 C 0.796,1.934 1.147,1.373 1.018,0.811 0.906,0.327 0.476,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFAC33" d="M35.337 23.549C34.291 29.819 27.615 34 18.092 34S1.894 29.819.849 23.549c-.247-1.479.156-8.12 1.054-9.406 2.559-3.664 3.474 10.365 16.189 10.365 13.847 0 13.64-14.028 16.199-10.365.898 1.286 1.292 7.927 1.046 9.406z"/><path fill="#8A4B38" d="M18.092 5.995c-9.331 0-16.895 4.584-16.895 10.239 0 5.655 7.564 10.24 16.895 10.24 9.33 0 16.895-4.585 16.895-10.24S27.422 5.995 18.092 5.995zm0 13.374c-3.174 0-5.748-.702-5.748-1.568 0-.866 2.574-1.567 5.748-1.567 3.173 0 5.747.701 5.747 1.567.001.866-2.573 1.568-5.747 1.568z"/><path fill="#8A4B38" d="M1.72 14.623c-.653 1.045-.92 5.494.479 7.577 2.134 3.18 3.179 1.567 4.747 2.047 2.335.715 2.508 2.56 4.354 3.483 2.09 1.045 3.306.741 6.27 0 4.181-1.045 6.837 1.088 9.405 0 2.107-.893 3.312-4.137 4.486-4.528 3.728-1.242 4.515-7.124 1.741-9.537-.87 1.829-5.138 8.404-7.881 8.71-2.744.305-10.974 1-14.457-.784-3.484-1.785-7.01-4.006-7.446-4.616-.436-.611-1.698-2.352-1.698-2.352z"/><path fill="#F4900C" d="M18.092 13.882c-3.752 0-6.793 1.228-6.793 2.743 0 .589.463 1.133 1.245 1.58-.126-.129-.2-.264-.2-.404 0-.866 2.574-1.567 5.748-1.567 3.173 0 5.747.701 5.747 1.567 0 .14-.073.274-.2.404.782-.447 1.246-.991 1.246-1.58.001-1.515-3.041-2.743-6.793-2.743z"/><path fill="#F4ABBA" d="M4.42 18.15c-.375 0-.737-.203-.925-.557-.27-.51-.075-1.143.436-1.412l2.308-1.22c.509-.272 1.142-.075 1.412.436.27.51.075 1.143-.436 1.412l-2.308 1.22c-.156.082-.323.121-.487.121zm11.887 7.794c-.41 0-.799-.242-.966-.646l-.74-1.786c-.221-.533.032-1.144.565-1.365.534-.22 1.144.032 1.365.566l.74 1.786c.221.533-.032 1.145-.566 1.365-.129.055-.265.08-.398.08z"/><path fill="#55ACEE" d="M28.151 21.764c-.181 0-.364-.047-.53-.146-.497-.293-.662-.935-.368-1.431l1.132-1.916c.293-.496.938-.661 1.431-.368.497.294.662.935.368 1.432l-1.132 1.915c-.195.33-.543.514-.901.514z"/><path fill="#F4ABBA" d="M29.893 14c-.56 0-1.023-.481-1.043-1.046-.021-.576.431-1.079 1.007-1.1l1.218-.052c.587-.007 1.062.426 1.081 1.003.021.577-.431 1.096-1.007 1.116L29.931 14h-.038zM19.792 9.876c-.444 0-.855-.285-.997-.73-.174-.55.131-1.137.681-1.312l.826-.261c.556-.174 1.138.131 1.312.682.175.55-.131 1.137-.681 1.312l-.826.261c-.105.033-.211.048-.315.048z"/><path fill="#88C9F9" d="M13.998 11.574c-.157 0-.316-.036-.466-.11l-.784-.392c-.516-.258-.726-.886-.468-1.402.258-.516.886-.726 1.402-.468l.784.392c.516.258.726.886.468 1.402-.184.366-.553.578-.936.578zm9.102 13.28c-.156 0-.315-.035-.465-.109l-.784-.391c-.517-.258-.727-.885-.47-1.401.257-.517.884-.727 1.401-.47l.784.391c.517.258.727.885.47 1.401-.182.367-.553.579-.936.579z"/><path fill="#55ACEE" d="M9.426 22.548c-.138 0-.277-.026-.412-.085-.53-.228-.776-.842-.548-1.372l.392-.914c.228-.529.843-.779 1.373-.548.53.227.776.842.548 1.372l-.392.914c-.17.395-.555.633-.961.633zm15.592-9.885c-.403 0-.787-.234-.958-.627-.232-.529.01-1.145.538-1.376l.696-.305c.53-.232 1.146.01 1.376.538.231.529-.01 1.145-.538 1.377l-.696.305c-.137.06-.279.088-.418.088zM8.035 12.62c-.078 0-.157-.009-.235-.027l-.566-.13c-.562-.13-.914-.691-.784-1.253.129-.563.691-.913 1.253-.784l.566.13c.562.13.914.691.784 1.253-.112.483-.543.811-1.018.811z"/></svg> \ No newline at end of file |