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/1f6f7.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/1f6f7.svg')
-rw-r--r-- | public/emoji/1f6f7.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f6f7.svg b/public/emoji/1f6f7.svg index 91f565373..12d776dba 100644 --- a/public/emoji/1f6f7.svg +++ b/public/emoji/1f6f7.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(36,22.9375)" id="g20"><path id="path22" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-18.937 c 0,0 0,-4 -4,-4 l -28,0 c -4,0 -4,4 -4,4 l 0,4.937 c 0,0 17,10 36,14"/></g><g transform="translate(26.0044,20.4775)" id="g24"><path id="path26" style="fill:#9d0522;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.341,-0.693 -17.35,-9.168 -19.132,-10.044 -2.822,-1.388 -5.22,-0.05 -6.416,1.769 -0.616,0.937 -0.406,1.218 0,1.312 0.406,0.094 1.424,0.277 1.688,-0.25 0.437,-0.875 2.531,-2.031 3.625,-1.531 1.093,0.5 17.937,9.531 18.562,9.812 0.625,0.282 0.906,0.282 1.375,0 C 0.171,0.787 1.017,0.525 0,0"/></g><g transform="translate(11.1426,6.7363)" id="g28"><path id="path30" style="fill:#e75a70;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.081,0 -0.163,0.02 -0.238,0.061 L -9.539,5.12 c -0.243,0.132 -0.333,0.436 -0.201,0.679 0.132,0.242 0.436,0.332 0.678,0.2 L 0.239,0.939 C 0.482,0.808 0.572,0.504 0.44,0.261 0.349,0.095 0.177,0 0,0"/></g><g transform="translate(35.4519,15.3932)" id="g32"><path id="path34" style="fill:#9d0522;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.341,-0.693 -17.35,-9.168 -19.132,-10.044 -2.822,-1.388 -5.22,-0.05 -6.416,1.769 -0.616,0.937 -0.406,1.218 0,1.312 0.406,0.094 1.424,0.277 1.688,-0.25 0.437,-0.875 2.531,-2.031 3.625,-1.531 1.093,0.5 17.937,9.531 18.562,9.812 0.625,0.282 0.906,0.282 1.375,0 C 0.171,0.787 1.017,0.525 0,0"/></g><g transform="translate(19.167,7.7295)" id="g36"><path id="path38" style="fill:#9d0522;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.058,0 -0.117,0.01 -0.174,0.031 -0.259,0.097 -0.39,0.384 -0.295,0.643 L 2.01,7.34 C 2.071,7.506 2.216,7.626 2.389,7.658 2.568,7.687 2.74,7.627 2.855,7.494 L 6.189,3.661 C 6.371,3.453 6.349,3.137 6.141,2.956 5.932,2.773 5.617,2.798 5.436,3.005 L 2.653,6.203 0.469,0.326 C 0.394,0.124 0.203,0 0,0"/></g><g transform="translate(9.8779,12.6377)" id="g40"><path id="path42" style="fill:#9d0522;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.058,0 -0.117,0.01 -0.174,0.031 -0.433,0.128 -0.565,0.415 -0.469,0.674 L 2.01,7.34 C 2.072,7.506 2.216,7.626 2.39,7.658 2.563,7.694 2.74,7.627 2.856,7.494 L 6.19,3.661 C 6.371,3.453 6.349,3.137 6.141,2.956 5.932,2.774 5.618,2.797 5.435,3.005 L 2.654,6.203 0.469,0.326 C 0.394,0.124 0.203,0 0,0"/></g><g transform="translate(28.4834,12.6377)" id="g44"><path id="path46" style="fill:#9d0522;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.058,0 -0.117,0.01 -0.174,0.031 -0.26,0.097 -0.39,0.384 -0.295,0.643 L 2.011,7.34 C 2.072,7.506 2.217,7.626 2.39,7.658 2.568,7.691 2.741,7.627 2.856,7.494 L 6.189,3.661 C 6.371,3.453 6.349,3.137 6.141,2.956 5.933,2.773 5.617,2.798 5.436,3.005 L 2.654,6.203 0.469,0.326 C 0.394,0.124 0.203,0 0,0"/></g><g transform="translate(23.9214,25.2206)" id="g48"><path id="path50" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.076,0.558 1.113,0.628 2.249,0.024 1.136,-0.605 6.569,-3.484 7.21,-3.826 0.815,-0.433 1.112,-0.591 -0.449,-1.421 -1.696,-0.901 -12.305,-6.511 -12.931,-6.822 -0.766,-0.381 -1.312,-0.328 -2.207,0.112 -0.718,0.352 -6.548,3.463 -7.275,3.875 -0.821,0.465 -0.483,0.706 0.768,1.37 C -11.384,-6.023 0,0 0,0"/></g><path id="path52" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 11.501,17.597 -1.416,0 0,1.329 1.416,0 0,-1.329 z"/><path id="path54" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 34.048,20.811 -1.125,0 0,1.422 1.125,0 0,-1.422 z"/><g transform="translate(23.9214,26.5653)" id="g56"><path id="path58" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.076,0.558 1.113,0.628 2.249,0.024 1.136,-0.605 6.569,-3.484 7.21,-3.826 0.815,-0.433 1.112,-0.591 -0.449,-1.421 -1.696,-0.901 -12.305,-6.511 -12.931,-6.822 -0.766,-0.381 -1.312,-0.328 -2.207,0.112 -0.718,0.352 -6.548,3.462 -7.275,3.875 -0.821,0.465 -0.483,0.706 0.768,1.37 C -11.384,-6.023 0,0 0,0"/></g><g transform="translate(12.5317,18.625)" id="g60"><path id="path62" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.179,0 -0.352,0.096 -0.442,0.265 -0.13,0.244 -0.037,0.547 0.207,0.676 l 12.313,6.544 c 0.242,0.13 0.547,0.038 0.675,-0.206 0.13,-0.244 0.038,-0.547 -0.207,-0.676 L 0.234,0.059 C 0.159,0.019 0.079,0 0,0"/></g><g transform="translate(19.2461,15.1748)" id="g64"><path id="path66" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.179,0 -0.352,0.097 -0.441,0.266 -0.13,0.243 -0.038,0.546 0.207,0.675 l 12.312,6.545 c 0.241,0.131 0.546,0.037 0.676,-0.207 0.13,-0.244 0.037,-0.547 -0.207,-0.676 L 0.234,0.059 C 0.16,0.019 0.08,0 0,0"/></g><g transform="translate(17.0752,16.3076)" id="g68"><path id="path70" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.179,0 -0.352,0.097 -0.442,0.266 -0.13,0.243 -0.037,0.546 0.207,0.675 l 12.313,6.545 c 0.241,0.131 0.546,0.037 0.676,-0.207 0.13,-0.244 0.037,-0.547 -0.207,-0.676 L 0.234,0.059 C 0.159,0.019 0.079,0 0,0"/></g><g transform="translate(14.8403,17.4404)" id="g72"><path id="path74" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.179,0 -0.352,0.096 -0.442,0.265 -0.13,0.244 -0.037,0.547 0.207,0.676 l 12.313,6.544 c 0.242,0.131 0.546,0.038 0.675,-0.206 0.13,-0.244 0.038,-0.547 -0.207,-0.676 L 0.234,0.059 C 0.159,0.019 0.079,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E1E8ED" d="M36 13.062V32s0 4-4 4H4c-4 0-4-4-4-4v-4.938s17-10 36-14z"/><path fill="#9D0522" d="M26.004 15.523c-1.341.693-17.35 9.168-19.132 10.044-2.822 1.388-5.22.05-6.416-1.769-.617-.938-.406-1.219 0-1.312s1.424-.277 1.688.25c.438.875 2.531 2.031 3.625 1.531s17.938-9.531 18.562-9.812.906-.281 1.375 0 1.315.542.298 1.068z"/><path fill="#E75A70" d="M11.143 29.264c-.081 0-.163-.02-.238-.061l-9.301-5.06c-.243-.132-.333-.436-.201-.679.132-.242.436-.332.678-.2l9.301 5.06c.243.132.333.436.201.679-.091.166-.263.261-.44.261z"/><path fill="#9D0522" d="M35.452 20.607c-1.341.693-17.35 9.168-19.132 10.044-2.822 1.387-5.22.05-6.416-1.769-.617-.938-.406-1.219 0-1.312s1.424-.277 1.688.25c.438.875 2.531 2.031 3.625 1.531s17.938-9.531 18.563-9.812.906-.281 1.375 0 1.314.542.297 1.068z"/><path fill="#9D0522" d="M19.167 28.271c-.058 0-.117-.01-.174-.031-.259-.097-.391-.384-.295-.643l2.479-6.666c.062-.166.206-.286.379-.318.18-.029.352.031.467.164l3.334 3.833c.182.208.159.524-.049.705-.209.183-.523.158-.705-.049l-2.782-3.198-2.185 5.877c-.075.201-.266.326-.469.326zm-9.289-4.909c-.058 0-.117-.01-.174-.031-.259-.097-.391-.384-.294-.643l2.479-6.667c.062-.166.206-.286.379-.317.173-.036.35.03.467.164l3.333 3.833c.181.208.159.524-.049.705-.208.182-.523.159-.706-.049l-2.781-3.198-2.186 5.876c-.075.203-.265.327-.468.327zm18.605 0c-.058 0-.117-.01-.174-.031-.26-.097-.391-.384-.295-.643l2.479-6.667c.062-.166.206-.286.379-.317.179-.034.352.031.467.164l3.333 3.833c.182.208.159.524-.049.705-.208.183-.523.158-.705-.049l-2.781-3.198-2.186 5.876c-.074.203-.264.327-.468.327z"/><path fill="#C1694F" d="M23.921 10.779c1.076-.558 1.113-.628 2.249-.024 1.136.604 6.569 3.484 7.21 3.825.814.434 1.112.591-.449 1.421-1.695.903-12.305 6.512-12.931 6.824-.765.381-1.311.327-2.206-.112-.718-.352-6.549-3.463-7.276-3.875-.82-.465-.482-.706.769-1.37 1.251-.666 12.634-6.689 12.634-6.689z"/><path fill="#C1694F" d="M10.085 17.075h1.416v1.329h-1.416zm22.838-3.308h1.125v1.422h-1.125z"/><path fill="#D99E82" d="M23.921 9.435c1.076-.558 1.113-.628 2.249-.024 1.136.604 6.569 3.484 7.21 3.825.814.434 1.112.591-.449 1.421-1.695.902-12.305 6.511-12.931 6.823-.765.381-1.311.327-2.206-.112-.718-.352-6.549-3.463-7.276-3.875-.82-.465-.482-.706.769-1.37 1.251-.665 12.634-6.688 12.634-6.688z"/><path fill="#BF6952" d="M12.532 17.375c-.179 0-.352-.096-.442-.265-.13-.244-.037-.547.207-.676L24.609 9.89c.242-.13.547-.038.676.207.13.244.037.547-.207.676l-12.312 6.544c-.075.039-.155.058-.234.058zm6.714 3.45c-.179 0-.352-.097-.441-.266-.13-.243-.037-.546.207-.676l12.312-6.544c.241-.131.546-.037.676.207s.037.547-.207.676L19.48 20.767c-.074.04-.154.058-.234.058zm-2.171-1.133c-.179 0-.352-.097-.442-.266-.13-.243-.037-.546.207-.676l12.313-6.544c.241-.131.546-.037.676.207s.037.547-.207.676L17.31 19.634c-.076.04-.156.058-.235.058zM14.84 18.56c-.179 0-.352-.096-.442-.265-.13-.244-.037-.547.207-.676l12.313-6.544c.242-.13.546-.038.676.207s.037.547-.207.676l-12.312 6.544c-.075.039-.156.058-.235.058z"/></svg> \ No newline at end of file |