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/1f3bc.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/1f3bc.svg')
-rw-r--r-- | public/emoji/1f3bc.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3bc.svg b/public/emoji/1f3bc.svg index 5a6b2c543..4b187e0a4 100644 --- a/public/emoji/1f3bc.svg +++ b/public/emoji/1f3bc.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="clipPath20" clipPathUnits="userSpaceOnUse"><path id="path22" 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 transform="translate(6.0003,33.0003)" id="g12"><path id="path14" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -6,0 0,-2.001 0,-4.999 0,-2 0,-5 0,-2 0,-5.001 0,-1.999 0,-5 0,-2.001 6,0 30,0 0,2.001 -30,0 0,5 30,0 0,1.999 -30,0 0,5.001 30,0 0,2 -30,0 0,5 30,0 0,2 -30,0 0,4.999 30,0 L 30,0 0,0 Z"/></g><g id="g16"><g clip-path="url(#clipPath20)" id="g18"><g transform="translate(18.6016,17.4199)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.653,0.943 1.452,1.837 2.431,2.718 L 2.769,0.979 C 2.053,0.617 1.448,0.078 0.969,-0.632 0.417,-1.452 0.123,-2.358 0.097,-3.349 0.113,-4.262 0.405,-5.085 0.968,-5.8 1.533,-6.508 2.262,-6.98 3.137,-7.2 l 0.12,-0.03 0.122,0.029 c 0.537,0.127 0.594,0.471 0.594,0.613 0,0.345 -0.224,0.621 -0.58,0.72 -0.367,0.17 -0.636,0.417 -0.82,0.758 -0.202,0.368 -0.308,0.713 -0.308,0.994 0,0.475 0.169,0.903 0.515,1.302 0.214,0.243 0.432,0.432 0.654,0.573 L 4.527,-7.749 C 4.145,-7.83 3.794,-7.881 3.481,-7.901 c -1.383,0.045 -2.517,0.5 -3.369,1.349 -0.433,0.443 -0.747,0.907 -0.958,1.423 -0.213,0.516 -0.327,1.059 -0.341,1.584 C -1.157,-2.272 -0.758,-1.08 0,0 M 4.945,11.479 C 4.765,10.953 4.516,10.423 4.202,9.903 3.895,9.386 3.573,8.93 3.243,8.544 3.138,8.418 3.041,8.313 2.955,8.222 2.877,8.575 2.827,8.967 2.806,9.386 c 0.015,0.685 0.116,1.364 0.304,2.081 0.17,0.661 0.408,1.26 0.696,1.756 0.304,0.468 0.621,0.705 0.944,0.705 0.115,0 0.196,-0.029 0.259,-0.087 0.07,-0.071 0.119,-0.208 0.15,-0.454 0.03,-0.134 0.047,-0.304 0.047,-0.494 0,-0.443 -0.088,-0.918 -0.261,-1.414 M 6.103,-7.16 5.057,-2.011 C 5.317,-2.066 5.559,-2.157 5.783,-2.287 6.18,-2.511 6.486,-2.816 6.728,-3.226 6.97,-3.615 7.12,-4.064 7.184,-4.528 7.184,-5.774 6.83,-6.643 6.103,-7.16 m 3.122,5.178 C 9.003,-1.336 8.683,-0.756 8.278,-0.26 7.867,0.253 7.352,0.668 6.749,0.973 6.139,1.282 5.49,1.432 4.767,1.432 4.682,1.432 4.559,1.423 4.401,1.406 L 3.868,3.999 c 0.613,0.603 1.156,1.3 1.616,2.077 0.499,0.847 0.885,1.771 1.145,2.741 0.268,0.978 0.399,1.942 0.399,2.945 0,2.106 -0.542,3.94 -1.627,5.475 C 5.243,17.434 5.113,17.581 5.015,17.669 4.62,18.024 4.226,18.08 3.31,17.402 2.841,17.05 2.428,16.542 2.087,15.896 1.735,15.252 1.478,14.53 1.301,13.696 1.115,12.87 1.017,11.974 1.009,11.012 1.05,9.66 1.243,8.311 1.585,6.999 0.815,6.22 0.193,5.569 -0.296,5.048 -0.816,4.479 -1.334,3.826 -1.835,3.105 -2.33,2.395 -2.745,1.612 -3.068,0.782 c -0.318,-0.807 -0.498,-1.693 -0.534,-2.655 0.008,-0.982 0.196,-1.944 0.561,-2.864 0.365,-0.903 0.884,-1.727 1.546,-2.45 0.665,-0.718 1.448,-1.288 2.325,-1.695 1.23,-0.569 2.644,-0.749 4.02,-0.51 0.063,-0.288 0.146,-0.628 0.244,-1.022 0.157,-0.648 0.274,-1.172 0.349,-1.56 0.074,-0.39 0.11,-0.765 0.11,-1.122 0,-0.541 -0.059,-0.955 -0.198,-1.3 -0.049,-0.203 -0.184,-0.413 -0.401,-0.621 -0.233,-0.226 -0.508,-0.401 -0.839,-0.533 -0.468,-0.183 -0.922,-0.231 -1.289,-0.18 0.195,0.105 0.375,0.241 0.537,0.405 0.433,0.443 0.653,0.988 0.653,1.622 0,0.447 -0.11,0.875 -0.328,1.282 -0.215,0.375 -0.508,0.684 -0.886,0.929 -0.378,0.224 -0.779,0.341 -1.226,0.341 l -0.006,0 c -0.511,-0.035 -0.954,-0.196 -1.301,-0.471 -0.36,-0.266 -0.646,-0.619 -0.852,-1.051 -0.193,-0.406 -0.307,-0.847 -0.338,-1.362 0.04,-1.04 0.478,-1.885 1.306,-2.508 0.786,-0.581 1.709,-0.877 2.74,-0.877 0.743,0 1.434,0.164 2.053,0.487 0.633,0.327 1.148,0.796 1.529,1.403 0.37,0.601 0.559,1.291 0.559,2.046 0,0.495 -0.043,0.96 -0.129,1.419 -0.085,0.458 -0.211,1.08 -0.384,1.869 -0.124,0.535 -0.219,0.987 -0.288,1.349 0.965,0.428 1.712,1.049 2.225,1.85 0.577,0.898 0.868,1.908 0.868,3 0,0.665 -0.112,1.342 -0.333,2.015"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#8899A6" d="M36 5V3H0v30h36v-2H6v-5h30v-2H6v-5h30v-2H6v-5h30v-2H6V5z"/><path fill="#292F33" d="M27.827 20.562c-.223-.646-.543-1.227-.947-1.723-.411-.513-.926-.928-1.529-1.232-.61-.31-1.259-.46-1.981-.46-.086 0-.208.009-.366.026l-.533-2.593c.613-.603 1.156-1.299 1.616-2.077.499-.847.885-1.77 1.145-2.741.269-.978.399-1.942.399-2.945 0-2.106-.542-3.94-1.627-5.475-.158-.196-.288-.343-.387-.431-.394-.355-.788-.412-1.704.266-.47.352-.883.86-1.224 1.506-.352.644-.608 1.366-.786 2.2-.185.826-.283 1.723-.292 2.684.041 1.352.234 2.701.576 4.013-.77.779-1.392 1.43-1.881 1.951-.521.569-1.038 1.222-1.539 1.943-.495.711-.91 1.493-1.233 2.324-.317.807-.497 1.693-.533 2.655.008.982.195 1.944.561 2.864.365.902.884 1.726 1.546 2.45.665.718 1.448 1.287 2.325 1.694 1.23.569 2.644.749 4.02.51.063.288.146.629.244 1.022.157.647.274 1.172.35 1.56.073.391.109.766.109 1.122 0 .541-.059.955-.197 1.301-.05.202-.185.412-.401.62-.233.227-.508.401-.839.533-.468.184-.922.231-1.289.181.195-.105.375-.241.537-.405.433-.443.652-.988.652-1.622 0-.447-.109-.875-.328-1.282-.215-.375-.508-.684-.886-.929-.378-.225-.778-.341-1.226-.341h-.006c-.512.034-.954.195-1.301.471-.36.266-.646.619-.852 1.051-.193.406-.307.847-.338 1.362.04 1.04.477 1.885 1.306 2.508.784.581 1.707.877 2.739.877.743 0 1.434-.164 2.053-.487.634-.326 1.148-.796 1.529-1.402.37-.602.559-1.291.559-2.046 0-.495-.043-.96-.129-1.419-.085-.458-.211-1.08-.384-1.869-.124-.535-.219-.987-.288-1.35.965-.428 1.712-1.049 2.226-1.85.576-.898.867-1.908.867-3-.001-.665-.112-1.342-.333-2.015zm-3.122 5.178l-1.047-5.149c.261.056.502.147.727.276.396.224.703.529.945.938.241.39.392.838.456 1.303 0 1.246-.354 2.115-1.081 2.632zM23.547 7.101c-.181.526-.43 1.057-.743 1.577-.307.517-.629.973-.959 1.359-.105.125-.202.231-.288.322-.078-.354-.128-.746-.149-1.165.016-.685.116-1.364.305-2.081.17-.661.408-1.259.695-1.756.305-.468.621-.705.944-.705.115 0 .196.028.259.087.07.071.119.208.15.454.03.133.047.303.047.494 0 .443-.088.918-.261 1.414zM18.602 18.58c.653-.943 1.452-1.837 2.431-2.718l.339 1.739c-.717.362-1.321.9-1.801 1.61-.552.82-.846 1.727-.872 2.717.017.913.309 1.736.871 2.451.566.708 1.294 1.181 2.169 1.4l.12.03.122-.029c.537-.127.594-.471.594-.613 0-.345-.224-.621-.579-.72-.367-.17-.637-.417-.82-.758-.202-.368-.309-.713-.309-.994 0-.476.17-.903.516-1.303.214-.242.432-.432.654-.572l1.093 5.508c-.382.081-.733.132-1.046.152-1.384-.045-2.518-.5-3.369-1.35-.434-.442-.747-.907-.958-1.423-.213-.516-.327-1.059-.342-1.584.029-1.27.429-2.463 1.187-3.543z"/></svg> \ No newline at end of file |