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/1f1f2-1f1f6.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/1f1f2-1f1f6.svg')
| -rw-r--r-- | public/emoji/1f1f2-1f1f6.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1f2-1f1f6.svg b/public/emoji/1f1f2-1f1f6.svg index 3a12ec050..f7053092c 100644 --- a/public/emoji/1f1f2-1f1f6.svg +++ b/public/emoji/1f1f2-1f1f6.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,9)" id="g20"><path id="path22" style="fill:#21428e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -28,0 c -2.209,0 -4,1.791 -4,4 l 0,18 c 0,2.209 1.791,4 4,4 l 28,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><path id="path24" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 20,5 -4,0 0,26 4,0 0,-26 z"/><path id="path26" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,16 -36,0 0,4 36,0 0,-4 z"/><g transform="translate(6.6553,22.3774)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.27,0.311 4.001,0.453 3.798,-0.058 3.537,-0.715 -0.327,-0.376 0,0 M 0.11,6.654 C -0.015,6.529 -0.124,6.576 0.001,6.732 0.126,6.888 0.235,6.779 0.11,6.654 M 4.782,0.373 C 4.407,1.04 1.095,1.31 -0.113,0.706 0.97,1.643 4.22,0.956 4.324,2.498 4.407,3.725 2.095,3.623 1.199,3.852 0.304,4.081 1.095,4.331 1.782,4.623 2.47,4.915 3.22,5.185 3.053,6.178 2.887,7.17 1.199,7.102 0.428,7.143 c -0.771,0.042 -1.75,-0.25 -1.521,-0.729 -0.604,-0.25 -1.312,-0.208 -1.729,0 -0.005,-0.166 0.26,-0.229 0.26,-0.229 L -3.009,6.081 c 0.521,-0.25 1.604,-0.125 2.062,0.104 0.084,-0.104 0.375,-0.167 1.5,-0.104 1.125,0.062 1.25,0.271 1.521,0.021 C 2.529,5.682 1.574,5.518 0.366,5.081 -0.843,4.643 -0.322,3.581 0.324,3.248 0.97,2.915 1.616,2.943 2.699,2.768 3.783,2.592 3.012,2.373 2.387,2.331 2.157,2.315 0.324,2.248 -0.655,1.727 -1.799,1.118 -1.572,0.352 -1.676,0.227 -1.78,0.102 -2.78,0.143 -3.551,0.373 c 0.271,-0.75 1.563,-0.75 2.021,-0.771 0.458,-0.021 0.875,-1.104 3.646,-1.063 2.771,0.042 3.041,1.167 2.666,1.834"/></g><g transform="translate(27.4883,22.3774)" id="g32"><path id="path34" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.27,0.311 4.001,0.453 3.798,-0.058 3.537,-0.715 -0.327,-0.376 0,0 M 0.11,6.654 C -0.015,6.529 -0.124,6.576 0.001,6.732 0.126,6.888 0.235,6.779 0.11,6.654 M 4.782,0.373 C 4.407,1.04 1.095,1.31 -0.113,0.706 0.971,1.643 4.22,0.956 4.324,2.498 4.407,3.725 2.095,3.623 1.199,3.852 0.304,4.081 1.095,4.331 1.782,4.623 2.47,4.915 3.22,5.185 3.053,6.178 2.887,7.17 1.199,7.102 0.428,7.143 -0.343,7.185 -1.322,6.893 -1.093,6.414 -1.697,6.164 -2.405,6.206 -2.822,6.414 -2.827,6.248 -2.561,6.185 -2.561,6.185 L -3.01,6.081 c 0.522,-0.25 1.605,-0.125 2.063,0.104 0.084,-0.104 0.375,-0.167 1.5,-0.104 1.125,0.062 1.25,0.271 1.521,0.021 C 2.529,5.682 1.574,5.518 0.365,5.081 -0.843,4.643 -0.322,3.581 0.324,3.248 0.971,2.915 1.615,2.943 2.699,2.768 3.783,2.592 3.012,2.373 2.387,2.331 2.157,2.315 0.324,2.248 -0.655,1.727 -1.799,1.118 -1.572,0.352 -1.676,0.227 -1.779,0.102 -2.78,0.143 -3.551,0.373 c 0.272,-0.75 1.563,-0.75 2.021,-0.771 0.458,-0.021 0.875,-1.104 3.645,-1.063 2.772,0.042 3.042,1.167 2.667,1.834"/></g><g transform="translate(6.6553,7.8359)" id="g36"><path id="path38" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.27,0.311 4.001,0.453 3.798,-0.059 3.537,-0.715 -0.327,-0.377 0,0 M 0.11,6.653 C -0.015,6.528 -0.124,6.575 0.001,6.731 0.126,6.888 0.235,6.778 0.11,6.653 M 4.782,0.372 C 4.407,1.039 1.095,1.31 -0.113,0.705 0.97,1.643 4.22,0.955 4.324,2.497 4.407,3.725 2.095,3.622 1.199,3.852 0.304,4.08 1.095,4.33 1.782,4.622 2.47,4.914 3.22,5.185 3.053,6.178 2.887,7.17 1.199,7.102 0.428,7.143 c -0.771,0.041 -1.75,-0.25 -1.521,-0.729 -0.604,-0.25 -1.312,-0.209 -1.729,0 -0.005,-0.167 0.26,-0.229 0.26,-0.229 L -3.009,6.08 C -2.488,5.83 -1.405,5.955 -0.947,6.185 -0.863,6.08 -0.572,6.018 0.553,6.08 1.678,6.143 1.803,6.352 2.074,6.102 2.529,5.682 1.574,5.518 0.366,5.08 -0.843,4.643 -0.322,3.58 0.324,3.247 0.97,2.914 1.616,2.943 2.699,2.768 3.783,2.592 3.012,2.372 2.387,2.33 2.157,2.314 0.324,2.247 -0.655,1.727 -1.799,1.117 -1.572,0.352 -1.676,0.227 -1.78,0.102 -2.78,0.143 -3.551,0.372 c 0.271,-0.75 1.563,-0.75 2.021,-0.77 0.458,-0.022 0.875,-1.105 3.646,-1.063 2.771,0.041 3.041,1.166 2.666,1.833"/></g><g transform="translate(27.4883,7.8359)" id="g40"><path id="path42" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.27,0.311 4.001,0.453 3.798,-0.059 3.537,-0.715 -0.327,-0.377 0,0 M 0.11,6.653 C -0.015,6.528 -0.124,6.575 0.001,6.731 0.126,6.888 0.235,6.778 0.11,6.653 M 4.782,0.372 C 4.407,1.039 1.095,1.31 -0.113,0.705 0.971,1.643 4.22,0.955 4.324,2.497 4.407,3.725 2.095,3.622 1.199,3.852 0.304,4.08 1.095,4.33 1.782,4.622 2.47,4.914 3.22,5.185 3.053,6.178 2.887,7.17 1.199,7.102 0.428,7.143 -0.343,7.184 -1.322,6.893 -1.093,6.414 -1.697,6.164 -2.405,6.205 -2.822,6.414 -2.827,6.247 -2.561,6.185 -2.561,6.185 L -3.01,6.08 C -2.488,5.83 -1.405,5.955 -0.947,6.185 -0.863,6.08 -0.572,6.018 0.553,6.08 1.678,6.143 1.803,6.352 2.074,6.102 2.529,5.682 1.574,5.518 0.365,5.08 -0.843,4.643 -0.322,3.58 0.324,3.247 0.971,2.914 1.615,2.943 2.699,2.768 3.783,2.592 3.012,2.372 2.387,2.33 2.157,2.314 0.324,2.247 -0.655,1.727 -1.799,1.117 -1.572,0.352 -1.676,0.227 -1.779,0.102 -2.78,0.143 -3.551,0.372 c 0.272,-0.75 1.563,-0.75 2.021,-0.77 0.458,-0.022 0.875,-1.105 3.645,-1.063 2.772,0.041 3.042,1.166 2.667,1.833"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#21428E" d="M36 27c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V9c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v18z"/><path fill="#EEE" d="M16 5h4v26h-4z"/><path fill="#EEE" d="M0 16h36v4H0z"/><path fill="#FFF" d="M11.438 13.25c-.375-.667-3.688-.938-4.896-.333 1.084-.938 4.333-.25 4.438-1.792.082-1.228-2.23-1.125-3.126-1.354-.895-.229-.104-.479.584-.771s1.438-.562 1.271-1.555c-.167-.993-1.855-.924-2.626-.966-.771-.041-1.75.25-1.521.729-.604.25-1.312.208-1.729 0-.005.167.26.229.26.229l-.447.105c.521.25 1.604.125 2.062-.104.083.104.375.167 1.5.104s1.25-.271 1.521-.021c.455.419-.5.583-1.708 1.021-1.208.438-.688 1.5-.042 1.833.646.333 1.292.304 2.375.48 1.084.176.312.395-.312.437-.23.016-2.063.083-3.042.604-1.144.608-.917 1.375-1.021 1.5-.104.125-1.104.083-1.875-.146.271.75 1.563.75 2.021.771S6 15.125 8.771 15.083s3.041-1.166 2.667-1.833zM6.766 6.969c-.125.125-.235.078-.11-.078s.235-.047.11.078zm-.111 6.654c.27-.311 4.001-.453 3.798.058-.261.656-4.125.318-3.798-.058zm25.616-.373c-.375-.667-3.688-.938-4.896-.333 1.084-.938 4.333-.25 4.438-1.792.083-1.228-2.229-1.125-3.125-1.354-.896-.229-.105-.479.583-.771s1.438-.562 1.271-1.555c-.166-.993-1.854-.924-2.625-.965-.771-.041-1.75.25-1.521.729-.604.25-1.312.208-1.729 0-.005.167.261.229.261.229l-.448.104c.521.25 1.604.125 2.062-.104.084.104.375.167 1.5.104s1.25-.271 1.521-.021c.455.419-.5.583-1.709 1.021-1.208.438-.688 1.5-.041 1.833s1.291.304 2.375.48.312.395-.312.437c-.229.016-2.062.083-3.042.604-1.143.608-.917 1.375-1.021 1.5s-1.104.083-1.875-.146c.271.75 1.562.75 2.02.771s.875 1.104 3.646 1.062c2.771-.041 3.042-1.166 2.667-1.833zm-4.672-6.281c-.125.125-.234.078-.109-.078s.234-.047.109.078zm-.111 6.654c.269-.311 4.001-.453 3.798.058-.261.656-4.125.318-3.798-.058zm-16.05 14.169c-.375-.667-3.688-.938-4.896-.333 1.084-.938 4.333-.25 4.438-1.792.083-1.227-2.229-1.125-3.125-1.354-.896-.229-.104-.479.583-.771s1.438-.562 1.271-1.556c-.167-.992-1.854-.924-2.625-.965-.771-.041-1.75.25-1.521.729-.604.25-1.312.209-1.729 0-.005.167.26.229.26.229l-.448.104c.521.25 1.604.125 2.062-.104.083.104.375.167 1.5.104s1.25-.271 1.521-.021c.455.42-.5.584-1.708 1.021-1.208.438-.688 1.5-.042 1.833.646.333 1.292.304 2.375.479 1.084.176.312.396-.312.438-.23.017-2.063.084-3.042.605-1.144.609-.917 1.375-1.021 1.5-.104.125-1.104.084-1.875-.146.271.75 1.562.75 2.021.771.458.021.875 1.104 3.646 1.062 2.771-.041 3.041-1.166 2.667-1.833zm-4.672-6.281c-.125.125-.234.078-.109-.078.124-.157.234-.047.109.078zm-.111 6.653c.27-.311 4.001-.453 3.798.059-.261.656-4.125.318-3.798-.059zm25.616-.372c-.375-.667-3.688-.938-4.896-.333 1.084-.938 4.333-.25 4.438-1.792.083-1.227-2.229-1.125-3.125-1.354-.896-.229-.104-.479.583-.771s1.438-.562 1.271-1.556c-.166-.992-1.854-.924-2.625-.965-.771-.041-1.75.25-1.521.729-.604.25-1.312.209-1.729 0-.005.167.261.229.261.229l-.448.104c.521.25 1.604.125 2.062-.104.084.104.375.167 1.5.104s1.25-.271 1.521-.021c.455.42-.5.584-1.709 1.021-1.208.438-.688 1.5-.041 1.833s1.291.304 2.375.479.312.396-.312.438c-.229.016-2.062.083-3.042.604-1.143.609-.917 1.375-1.021 1.5s-1.104.084-1.875-.146c.271.75 1.562.75 2.021.771.458.021.875 1.104 3.646 1.062 2.77-.04 3.041-1.165 2.666-1.832zm-4.672-6.281c-.125.125-.234.078-.109-.078.124-.157.234-.047.109.078zm-.111 6.653c.269-.311 4.001-.453 3.798.059-.261.656-4.125.318-3.798-.059z"/></svg> \ No newline at end of file |
