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/1f990.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/1f990.svg')
-rw-r--r-- | public/emoji/1f990.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f990.svg b/public/emoji/1f990.svg index 741d889d7..8279307e1 100644 --- a/public/emoji/1f990.svg +++ b/public/emoji/1f990.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="clipPath48" clipPathUnits="userSpaceOnUse"><path id="path50" d="M 2,27 C 1.438,26.188 1.523,22.329 5,21 l 0,0 c 1.3,-0.497 4.242,-0.172 7.02,0.152 l 0,0 c 1.845,0.216 3.617,0.431 4.789,0.407 l 0,0 c 3.023,-0.065 5.75,-0.947 8.629,-2.546 l 0,0 c 2.807,-1.557 4.526,-5.937 4.454,-7.555 l 0,0 c -0.036,-0.812 0.169,-1.406 0.608,-1.77 l 0,0 c 0.792,-0.653 2.078,-0.343 3.018,-0.117 l 0,0 c 0.317,0.076 0.647,0.155 0.798,0.153 l 0,0 0.302,0.991 0.098,0.286 c 1.981,5.771 0.366,9.121 -1.338,11.754 l 0,0 c -2.541,3.927 -6.765,6.628 -11.255,7.483 l 0,0 c -2.313,0.441 -4.892,0.685 -7.429,0.685 l 0,0 C 9.207,30.923 3.923,29.778 2,27"/></clipPath><clipPath id="clipPath72" clipPathUnits="userSpaceOnUse"><path id="path74" d="M 30.791,12.598 C 30.402,12.451 30.12,12.172 29.974,11.794 l 0,0 -0.001,0 c -0.08,-0.204 -0.116,-0.438 -0.112,-0.693 l 0,0 c 0.01,-0.508 -0.112,-1.094 -0.365,-1.744 l 0,0 C 28.985,8.041 27.958,6.557 26.877,5.578 l 0,0 C 26.461,5.199 26.159,4.777 25.982,4.324 l 0,0 C 25.662,3.495 25.816,2.64 26.367,2.193 l 0,0 C 26.815,1.83 27.426,1.822 27.958,2.171 l 0,0 c 0.538,0.353 0.892,0.405 1.033,0.343 l 0,0 C 29.138,2.449 29.265,2.165 29.33,1.752 l 0,0 c 0.219,-1.369 1.014,-1.617 1.346,-1.661 l 0,0 C 31.383,0 32.081,0.49 32.456,1.34 l 0,0 0.049,0.118 c 0.564,1.453 2.175,8.657 2.328,9.716 l 0,0 c 0.04,0.281 -0.103,0.558 -0.357,0.686 l 0,0 c -0.327,0.167 -1.76,0.861 -2.937,0.86 l 0,0 c -0.268,0 -0.523,-0.035 -0.748,-0.122"/></clipPath><clipPath id="clipPath84" clipPathUnits="userSpaceOnUse"><path id="path86" 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(15.2241,21.0815)" id="g20"><path id="path22" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.005,-0.552 -0.439,-1.003 -0.991,-1.009 -1.543,-1.014 -1.995,-0.57 -2,-0.018 l -0.035,4 C -2.04,4.534 -1.596,4.986 -1.044,4.991 -0.492,4.996 -0.041,4.552 -0.036,4 L 0,0 Z"/></g><g transform="translate(19.6387,20.6348)" id="g24"><path id="path26" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.129,-0.537 -0.668,-0.869 -1.205,-0.741 -0.536,0.128 -0.869,0.667 -0.741,1.204 L -1.02,4.355 C -0.893,4.892 -0.353,5.223 0.184,5.096 0.722,4.968 1.054,4.429 0.926,3.892 L 0,0 Z"/></g><g transform="translate(23.6387,19.1177)" id="g28"><path id="path30" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.25,-0.493 -0.852,-0.69 -1.345,-0.441 -0.491,0.249 -0.689,0.85 -0.441,1.343 l 1.804,3.57 C 0.266,4.965 0.868,5.163 1.361,4.914 1.854,4.665 2.052,4.063 1.803,3.571 L 0,0 Z"/></g><g transform="translate(4.458,28.5708)" id="g32"><path id="path34" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -4.53,-0.32 -4.775,5.511 3.801,4.738 12.377,3.965 21.765,1.337 24.019,2.949 25.808,4.228 25.435,6.557 24.984,7.027 24.534,7.496 23.852,7.072 24.197,6.345 24.541,5.617 24.136,3.667 21.936,3.47 19.736,3.273 11.535,4.822 6.36,5.55 1.076,6.294 -3.171,5.925 -4.094,2.969 -5.014,0.022 -2.15,-0.903 -0.636,-1.047 0.878,-1.191 0,0 0,0"/></g><g transform="translate(33.3779,22.7544)" id="g36"><path id="path38" style="fill:#c16a4f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.704,-2.632 3.319,-5.982 1.338,-11.753 L 1.24,-12.039 0.939,-13.031 c -0.152,0.003 -0.481,-0.076 -0.799,-0.153 -0.94,-0.226 -2.226,-0.535 -3.018,0.117 -0.439,0.364 -0.644,0.959 -0.608,1.771 0.072,1.618 -1.647,5.997 -4.454,7.555 -2.879,1.598 -5.606,2.481 -8.628,2.545 -2.938,0.063 -9.646,-1.385 -11.81,-0.558 -3.477,1.328 -3.561,5.188 -3,6 2.813,4.062 12.806,4.631 20.123,3.238 C -6.765,6.629 -2.541,3.928 0,0"/></g><g transform="translate(26.877,5.5781)" id="g40"><path id="path42" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.081,0.979 2.108,2.463 2.619,3.779 0.253,0.65 0.375,1.236 0.365,1.743 -0.005,0.256 0.033,0.49 0.112,0.695 l 10e-4,0 C 3.243,6.594 3.684,7.367 3.914,7.02 5.596,4.512 7.197,6.487 7.6,6.282 7.854,6.153 7.996,5.877 7.956,5.596 7.803,4.537 6.191,-2.668 5.628,-4.12 L 5.579,-4.238 C 5.203,-5.089 4.506,-5.578 3.8,-5.487 3.468,-5.443 2.672,-5.195 2.453,-3.826 2.389,-3.414 2.262,-3.129 2.114,-3.064 1.974,-3.002 1.619,-3.055 1.081,-3.407 0.549,-3.757 -0.062,-3.748 -0.51,-3.385 -1.062,-2.938 -1.215,-2.083 -0.895,-1.254 -0.718,-0.801 -0.416,-0.379 0,0"/></g></g></g><g id="g44"><g clip-path="url(#clipPath48)" id="g46"><g transform="translate(24.3203,18.6982)" id="g52"><path id="path54" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.922,2.735 -17.601,-5.1 -22.32,4.302 -18.601,2.587 -11.694,5.166 -5.778,4.635 6.088,3.57 6.429,-5.499 6.471,-6.287 5.945,-12.089 0,0 0,0"/></g><g transform="translate(23.2188,27.4307)" id="g56"><path id="path58" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.053,1.03 3.189,2.242 4.807,2.277 6.422,2.313 4.43,4.578 2.726,3.748 1.592,3.249 -0.414,1.211 -1.025,0.066 -1.635,-1.078 -0.891,-0.87 0,0"/></g><g transform="translate(35.6836,22.2588)" id="g60"><path id="path62" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.289,1.22 -5.321,3.227 -7.51,2.143 -9.698,1.059 -8.488,2.61 -7.484,3.348 -5.861,4.54 -3.437,4.097 -2.298,3.046 -1.158,1.997 0,0 0,0"/></g><g transform="translate(37.9209,14.7832)" id="g64"><path id="path66" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.732,1.931 -3.894,4.855 -6.321,4.586 -8.748,4.318 -7.08,5.361 -5.884,5.71 -3.951,6.274 -1.825,5.027 -1.115,3.649 -0.404,2.273 0,0 0,0"/></g></g></g><g id="g68"><g clip-path="url(#clipPath72)" id="g70"><g transform="translate(29.9102,0.2832)" id="g76"><path id="path78" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.687,2.303 2.174,7.969 -3.405,1.472 -5.373,-1.341 0,0 0,0"/></g></g></g><g id="g80"><g clip-path="url(#clipPath84)" id="g82"><g transform="translate(6.0835,29.2915)" id="g88"><path id="path90" style="fill:#c16a4f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4.542,0 -4.375,5.833 4.125,4.458 8.501,-1.375 17.679,-4.657 20.042,-3.208 1.875,1.15 1.666,3.5 1.25,4 C 25.001,5.75 24.292,5.375 24.584,4.625 24.876,3.875 24.334,1.958 22.126,1.917 19.918,1.874 11.846,3.998 6.735,5.088 1.517,6.202 -2.747,6.134 -3.875,3.25 -5,0.375 -2.208,-0.75 -0.708,-1 0.792,-1.25 0,0 0,0"/></g><g transform="translate(8,27)" id="g92"><path id="path94" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.448,-1 -1,-1 -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 0.552,0 1,-0.448 1,-1"/></g><g transform="translate(16.605,19.4736)" id="g96"><path id="path98" style="fill:#c16a4f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.069,-0.548 -0.57,-0.936 -1.118,-0.866 -0.547,0.069 -0.935,0.57 -0.866,1.117 L -1.48,4.22 c 0.069,0.548 0.569,0.935 1.117,0.866 C 0.185,5.017 0.573,4.516 0.503,3.968 L 0,0 Z"/></g><g transform="translate(20.5176,18.7793)" id="g100"><path id="path102" style="fill:#c16a4f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.161,-0.528 -0.72,-0.824 -1.249,-0.664 -0.527,0.162 -0.825,0.721 -0.663,1.249 l 1.17,3.825 c 0.161,0.529 0.72,0.825 1.249,0.664 C 1.034,4.913 1.332,4.354 1.17,3.825 L 0,0 Z"/></g><g transform="translate(24.0352,17.2979)" id="g104"><path id="path106" style="fill:#c16a4f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.289,-0.47 -0.904,-0.616 -1.376,-0.328 -0.47,0.29 -0.617,0.905 -0.327,1.376 L 0.393,4.455 C 0.682,4.926 1.297,5.072 1.768,4.783 2.238,4.494 2.386,3.878 2.096,3.407 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#BE1931" d="M4.458 7.429c-4.53.32-4.775-5.511 3.801-4.738 8.576.773 17.964 3.4 20.218 1.789 1.789-1.279 1.416-3.608.966-4.078-.45-.469-1.132-.045-.787.682.344.728-.062 2.678-2.262 2.875-2.199.197-10.4-1.352-15.575-2.081C5.534 1.136 1.287 1.504.364 4.46c-.919 2.947 1.944 3.873 3.458 4.017 1.514.143.636-1.048.636-1.048z"/><path fill="#DD2E44" d="M6.083 6.708c-4.542 0-4.375-5.833 4.125-4.458S27.887 6.907 30.25 5.458c1.875-1.15 1.666-3.5 1.25-4s-1.125-.125-.833.625-.25 2.667-2.458 2.708c-2.208.043-10.279-2.08-15.39-3.171C7.6.506 3.337.575 2.208 3.458c-1.125 2.875 1.667 4 3.167 4.25s.708-1 .708-1z"/><path fill="#DD2E44" d="M33.378 13.246c-2.541-3.928-6.765-6.629-11.255-7.484C14.806 4.369 4.812 4.938 2 9c-.562.812-.478 4.671 3 6 1.763.674 6.542-.162 9.841-.462l-.22 1.737c-.069.548.318 1.048.866 1.118.548.069 1.048-.318 1.118-.866l.264-2.082c.796.02 1.572.1 2.336.232l-.599 1.959c-.162.528.136 1.087.663 1.249.529.161 1.088-.136 1.249-.664l.638-2.088c.742.223 1.479.5 2.219.826l-1.043 1.695c-.29.471-.142 1.086.327 1.376.472.288 1.087.142 1.376-.328l1.14-1.854c.088.047.174.089.262.138 2.808 1.558 4.526 5.937 4.454 7.555-.036.812.169 1.406.608 1.771.792.652 2.078.343 3.018.117.318-.077.647-.156.799-.153l.302-.992.098-.285c1.981-5.772.366-9.121-1.338-11.753z"/><path fill="#BE1931" d="M22.193 8.503c-.609 1.144.135.936 1.025.066.596-.583 1.541-1.218 2.541-1.671-.562-.243-1.133-.459-1.714-.641-.785.756-1.522 1.628-1.852 2.246zm5.981 3.096c1.271-.63 2.827-.215 4.356.481-.684-.874-1.457-1.67-2.296-2.389-.717.044-1.431.26-2.034.703-1.005.737-2.215 2.288-.026 1.205zm3.863 3.908c-1.196.349-2.864 1.392-.438 1.124 1.411-.156 2.731.768 3.93 1.947-.14-1.046-.422-1.975-.782-2.82-.832-.37-1.791-.519-2.71-.251zm2.44 8.633c-.402-.205-2.004 1.771-3.686-.738-.003-.005-.008-.005-.011-.01-.076-1.172-.625-6.221-5.888-8.991-.559-.294-1.166-.565-1.837-.8-.845-.296-1.787-.537-2.827-.713-.536-.091-1.094-.168-1.686-.221-.103-.009-.209-.011-.313-.019-.99-.071-2.004-.063-3.025-.003-.665.039-1.333.097-1.998.168-3.97.423-7.844 1.242-10.491.452.506.706 1.24 1.336 2.285 1.735 1.491.569 5.137.06 8.222-.292l.002.228c.005.552.457.996 1.009.991.552-.005.996-.456.991-1.009l-.004-.411c.596-.048 1.14-.076 1.589-.066.33.007.656.028.98.055l-.097.406c-.128.538.205 1.077.741 1.204.537.128 1.076-.204 1.205-.741l.137-.577c.788.165 1.566.386 2.342.667l-.265.525c-.248.494-.05 1.095.441 1.344.493.249 1.095.051 1.345-.441l.327-.648c.488.232.977.477 1.472.752 2.792 1.55 4.506 5.887 4.453 7.526-.021.122-.032.251-.03.387.01.508-.112 1.094-.365 1.743-.511 1.316-1.538 2.8-2.619 3.779-.416.379-.718.801-.895 1.254-.32.829-.167 1.685.385 2.131.107.087.224.151.346.197 3.333-3.019 2.071-1.367 2.898 1.117.332.61.822.757 1.065.789.706.091 1.403-.398 1.779-1.249l.049-.118c.564-1.452 2.175-8.657 2.328-9.716.042-.282-.1-.558-.354-.687z"/><path fill="#292F33" d="M26.714 34.003c.39.147.839.092 1.244-.174.538-.353.893-.405 1.033-.343.147.064.274.35.339.762.059.367.16.649.282.872-.828-2.484 1.947-6.731-2.898-1.117z"/><circle fill="#292F33" cx="7" cy="9" r="1"/></svg> \ No newline at end of file |