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/1f1f1-1f1f0.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/1f1f1-1f1f0.svg')
-rw-r--r-- | public/emoji/1f1f1-1f1f0.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1f1-1f1f0.svg b/public/emoji/1f1f1-1f1f0.svg index 18ce60f46..a2fe8143e 100644 --- a/public/emoji/1f1f1-1f1f0.svg +++ b/public/emoji/1f1f1-1f1f0.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="clipPath32" clipPathUnits="userSpaceOnUse"><path id="path34" d="M 4,30 C 2.345,30 1,28.654 1,27 L 1,27 1,9 C 1,7.346 2.345,6 4,6 l 0,0 28,0 c 1.655,0 3,1.346 3,3 l 0,0 0,18 c 0,1.654 -1.345,3 -3,3 l 0,0 -28,0 z"/></clipPath><clipPath id="clipPath44" clipPathUnits="userSpaceOnUse"><path id="path46" 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:#ffb700;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><g transform="translate(4,6)" id="g24"><path id="path26" style="fill:#8d2129;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.654,0 -3,1.346 -3,3 l 0,18 c 0,1.654 1.346,3 3,3 l 28,0 c 1.654,0 3,-1.346 3,-3 L 31,3 C 31,1.346 29.654,0 28,0 L 0,0 Z"/></g></g></g><g id="g28"><g clip-path="url(#clipPath32)" id="g30"><path id="path36" style="fill:#005641;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 5,6 1,6 1,30 5,30 5,6 Z"/><path id="path38" style="fill:#ff5b00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 9,6 5,6 5,30 9,30 9,6 Z"/></g></g><g id="g40"><g clip-path="url(#clipPath44)" id="g42"><path id="path48" style="fill:#ffb700;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 10,5 9,5 9,31 10,31 10,5 Z"/><g transform="translate(13.1992,25.938)" id="g50"><path id="path52" style="fill:#ffb700;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.067,0.959 -0.035,1.762 0.021,0.532 -0.277,1.175 -0.84,1.082 -0.562,-0.094 -1.188,0.02 -1.188,0.02 0,0 0.126,-0.364 0,-0.708 C -2.188,1.812 -2.188,1.094 -1.344,1 -0.5,0.906 -0.156,0.469 0,0"/></g><g transform="translate(31.8828,25.938)" id="g54"><path id="path56" style="fill:#ffb700;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.067,0.959 0.035,1.762 -0.021,0.532 0.277,1.175 0.84,1.082 0.562,-0.094 1.188,0.02 1.188,0.02 0,0 -0.126,-0.364 0,-0.708 C 2.188,1.812 2.188,1.094 1.344,1 0.5,0.906 0.156,0.469 0,0"/></g><g transform="translate(13.1992,10.0625)" id="g58"><path id="path60" style="fill:#ffb700;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.067,-0.96 -0.035,-1.763 0.021,-0.532 -0.277,-1.175 -0.84,-1.081 -0.562,0.094 -1.188,-0.021 -1.188,-0.021 0,0 0.126,0.365 0,0.709 -0.125,0.344 -0.125,1.062 0.719,1.156 0.844,0.094 1.188,0.531 1.344,1"/></g><g transform="translate(31.8828,10.0625)" id="g62"><path id="path64" style="fill:#ffb700;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.067,-0.96 0.035,-1.763 -0.021,-0.532 0.277,-1.175 0.84,-1.081 0.562,0.094 1.188,-0.021 1.188,-0.021 0,0 -0.126,0.365 0,0.709 C 2.188,-1.812 2.188,-1.094 1.344,-1 0.5,-0.906 0.156,-0.469 0,0"/></g><g transform="translate(18.4063,22.625)" id="g66"><path id="path68" style="fill:#ffb700;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.594,0.031 1.187,0.187 0.594,0.157 0.407,0.719 0.407,0.719 0,0 0.531,0.281 0.844,0 C 2.75,0.625 3.125,0.656 2.938,1.031 3.5,1.312 3.75,0.687 3.75,0.687 c 0,0 0.281,0.177 0.344,0.417 C 4.594,1.156 4.687,0.656 5,0.719 5.312,0.781 5.531,1.108 5.531,1.108 5.531,1.108 5.594,0.219 5.062,0 5.5,-0.562 5.375,-1.656 5.375,-1.937 L 5.062,-1.75 c 0,0 0.188,-0.875 0.282,-1 0.093,-0.125 -0.313,0 -0.313,0 0,0 0.219,-0.594 0.375,-0.688 0.156,-0.093 3.094,0.188 3.938,0.188 0.844,0 2,0.125 2,0.875 0,0.75 -0.969,0.688 -2.063,0.531 C 8.188,-2 7.469,-1.969 7.031,-1.687 6.594,-1.406 6.095,-1.333 6.136,-2.042 c -0.667,0.313 -0.188,0.98 -0.188,0.98 0,0 -0.761,0.833 -0.276,1.666 0.484,0.833 2.359,1.084 3.672,0.354 1.312,-0.729 1.833,-1.332 2.375,-1.437 -0.021,0.396 0.646,0.687 0.729,-0.042 0.083,-0.729 -0.834,-0.583 -1.229,-0.354 -0.396,0.229 -1.105,0.917 -1.105,0.917 0,0 -0.021,-0.418 0.25,-0.688 C 9.614,-0.562 9.448,0 9.448,0 9.448,0 9.406,-0.604 8.719,-0.625 9.219,-0.042 9.052,0.437 8.364,0.687 8.761,0.083 8.385,-0.438 7.802,-0.521 8.198,0.042 7.865,0.687 7.136,0.812 7.239,0.354 6.886,0.229 6.886,0.229 c 0,0 -0.166,0.417 -0.5,0.188 -0.334,-0.23 -0.417,-0.729 0.02,-1.042 0.271,0.542 0.813,0.501 1,0.271 -0.562,-0.063 -0.541,-0.584 -0.333,-0.854 0.208,0.354 0.417,0.458 0.625,0.083 0.208,-0.375 0.833,-0.354 1.958,-0.187 1.125,0.166 2.161,0.044 2.333,-0.959 0.147,-0.854 -0.708,-1.271 -0.708,-1.271 0,0 1.104,-0.833 0.396,-2.645 C 10.969,-8 11.261,-8.75 11.531,-8.938 c 0.271,-0.187 0.688,-0.207 0.125,-0.707 -0.562,-0.5 -0.417,-0.856 -0.187,-1.147 0.229,-0.291 0.167,-0.583 -0.5,-0.208 -0.292,-0.292 -0.583,-0.208 -0.75,0.042 -0.167,-0.23 -0.48,-0.292 -0.688,-0.042 -0.208,-0.167 -0.478,-0.167 -0.333,0.187 0.146,0.355 0.855,0.5 1.063,0.563 0.208,0.062 0.187,0.439 0.125,0.855 -0.063,0.416 -0.417,0.854 -1.167,1.25 C 8.886,-8.395 8.927,-8.686 9.052,-8.833 9.177,-8.979 9.573,-9.02 9.594,-9.145 9.614,-9.27 9.386,-9.542 9.136,-9.729 c -0.25,-0.188 -0.208,-0.522 -0.125,-0.688 0.083,-0.166 0.186,-0.577 -0.084,-0.768 -0.271,-0.19 -0.541,0.247 -0.541,0.247 0,0 -0.168,-0.52 -0.647,-0.02 -0.27,-0.334 -0.541,-0.209 -0.666,-0.021 -0.271,-0.271 -0.687,-0.25 -0.479,0.125 0.208,0.375 0.458,0.375 0.75,0.396 0.292,0.02 0.686,0.082 0.645,0.666 -0.041,0.584 -0.156,1.177 -0.562,1.542 -0.625,0.563 -0.521,1.23 -0.521,1.23 0,0 -1.042,0.103 -1.854,-0.459 -0.813,-0.563 -1.438,-0.563 -1.438,-0.563 0,0 -0.459,-0.5 -0.5,-0.812 -0.041,-0.313 0.147,-0.417 0.397,-0.5 0.25,-0.084 0.437,-0.063 0.062,-0.396 -0.375,-0.333 -0.687,-0.313 -0.687,-0.313 0,0 -0.022,-0.354 0.02,-0.562 0.042,-0.208 -0.084,-0.569 -0.292,-0.607 C 2.406,-11.27 2.094,-11 2.094,-11 c 0,0 -0.396,-0.417 -0.708,0.021 -0.355,-0.334 -0.667,-0.21 -0.792,0 -0.209,-0.334 -0.542,-0.188 -0.334,0.187 0.209,0.375 0.501,0.418 1.001,0.397 0.5,-0.022 0.916,0.375 0.728,0.895 -0.187,0.521 -0.353,1.23 -0.353,1.23 0,0 -0.396,0.041 -0.98,0.375 -0.729,-0.875 -0.979,-0.564 -1.187,-0.397 -0.209,0.167 -0.709,0.625 -0.709,0.625 0,0 -0.27,0.022 -0.229,-0.228 -0.291,0.02 -0.187,0.478 -0.187,0.708 0,0.229 -0.084,0.5 -0.25,0.5 -0.167,0 -0.417,-0.042 -0.417,-0.042 0,0 0,-0.082 0.25,-0.166 0.25,-0.084 0.229,-0.251 -0.021,-0.272 -0.25,-0.02 -0.416,-0.082 -0.229,-0.228 0.188,-0.147 0.209,-0.229 0.063,-0.375 -0.146,-0.147 -0.125,-0.541 0.125,-0.688 0.166,0.395 0.479,0.166 0.416,-0.105 -0.062,-0.27 -0.521,-0.229 -0.521,-0.229 l 0.313,-0.353 -0.476,-0.105 c 0,0 -0.024,-0.292 -0.212,-0.354 -0.187,-0.063 -0.229,0.437 -0.229,0.437 l -0.437,0.022 0.291,0.353 c 0,0 -0.417,0.147 -0.437,0.397 -0.021,0.25 0.312,0.125 0.375,0 0.333,0.145 0.229,0.478 0.104,0.603 -0.125,0.125 -0.042,0.228 0.083,0.375 0.125,0.147 0.105,0.228 -0.083,0.188 -0.187,-0.041 -0.5,0.334 -0.187,0.334 0.312,0 0.374,0.021 0.333,0.25 -0.375,0.041 -0.146,0.333 -0.146,0.333 0,0 -0.292,0.208 -0.083,0.354 -0.188,0.166 -0.23,0.438 -0.021,0.479 -0.125,0.104 0.042,0.292 0.042,0.292 0,0 -0.605,0.104 -0.605,0.562 0,0.458 0.521,0.375 0.521,0.375 0,0 -0.062,1.458 0.084,3.5 0.145,2.042 0.999,2.751 1.52,2.958 -0.541,-1.146 -0.479,-3.083 -0.479,-4.271 0,-1.187 -0.021,-2.124 -0.021,-2.124 0,0 0.584,-0.042 0.542,-0.438 C -1.49,-5.021 -1.76,-5.104 -1.76,-5.104 l 1.354,-1.354 c 0,0 -0.062,1.389 0.396,1.944 0.458,0.556 1.165,1.076 1.374,1.243 0.209,0.167 -0.129,0.609 -0.291,0.125 -0.236,0.029 -0.437,0.417 -0.437,0.417 0,0 0.02,-0.145 -0.126,-0.25 -0.145,-0.104 -0.104,0.355 -0.187,0.312 -0.083,-0.041 -0.313,-0.166 -0.604,-0.25 0.021,0.167 0.146,0.375 0.146,0.375 0,0 -0.375,-0.041 -0.709,-0.083 0,0.292 0.187,0.771 0.354,0.813 -0.416,0.208 -0.312,0.604 -0.125,0.541 0.188,-0.062 1.062,-0.583 2.042,-0.646 -0.313,0.355 -0.563,0.813 -0.563,0.813 L 0.761,-1.458 0.385,-1.104 0.344,-1.458 c 0,0 -0.917,0.666 -1.084,1.208 -0.166,0.542 0.021,0.939 0.334,0.896 C 0.198,0.562 0,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFB700" 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="#8D2129" d="M32 6H10v24h22c1.654 0 3-1.346 3-3V9c0-1.654-1.346-3-3-3z"/><path fill="#005641" d="M4 6C2.346 6 1 7.346 1 9v18c0 1.654 1.346 3 3 3h1V6H4z"/><path fill="#FF5B00" d="M5 6h4v24H5z"/><path d="M13.199 10.062s-.067-.959-.035-1.762c.021-.532-.277-1.175-.84-1.082s-1.188-.021-1.188-.021.125.364 0 .708-.125 1.062.719 1.156c.844.095 1.188.532 1.344 1.001zm18.684 0s.067-.959.035-1.762c-.021-.532.277-1.175.84-1.082s1.188-.021 1.188-.021-.125.364 0 .708.125 1.062-.719 1.156c-.844.095-1.188.532-1.344 1.001zM13.199 25.938s-.067.96-.035 1.763c.021.532-.277 1.175-.84 1.081-.562-.094-1.188.021-1.188.021s.125-.365 0-.709-.125-1.062.719-1.156c.844-.094 1.188-.532 1.344-1zm18.684 0s.067.96.035 1.763c-.021.532.277 1.175.84 1.081.562-.094 1.188.021 1.188.021s-.125-.365 0-.709.125-1.062-.719-1.156c-.844-.094-1.188-.532-1.344-1zM18.406 13.375s.594-.031 1.188-.188c.594-.156.406-.718.406-.718s.531-.281.844 0c.312.281.688.25.5-.125.562-.281.812.344.812.344s.281-.177.344-.417c.5-.052.594.448.906.385s.531-.389.531-.389.062.889-.469 1.108c.438.562.312 1.656.312 1.938l-.312-.188s.188.875.281 1c.094.125-.312 0-.312 0s.219.594.375.688c.156.094 3.094-.188 3.938-.188.844 0 2-.125 2-.875s-.969-.688-2.062-.531c-1.094.156-1.812.125-2.25-.156-.438-.281-.937-.354-.896.354-.667-.312-.188-.979-.188-.979s-.761-.833-.276-1.667c.484-.833 2.359-1.084 3.672-.354s1.833 1.333 2.375 1.438c-.021-.396.646-.687.729.042s-.834.583-1.229.354-1.104-.917-1.104-.917-.021.417.25.688c-.75-.083-.916-.646-.916-.646s-.043.603-.73.624c.5-.583.333-1.062-.354-1.312.396.604.021 1.125-.562 1.208.396-.562.063-1.208-.666-1.333.104.458-.25.583-.25.583s-.166-.417-.5-.188-.418.73.019 1.042c.271-.542.812-.5 1-.271-.562.062-.541.584-.333.854.208-.354.417-.458.625-.083s.833.354 1.958.188 2.161-.044 2.333.958c.146.854-.708 1.271-.708 1.271s1.104.833.396 2.646-.416 2.562-.146 2.75.688.208.125.708-.417.855-.188 1.146.167.583-.5.208c-.292.292-.583.208-.75-.042-.167.229-.479.292-.688.042-.208.167-.479.167-.333-.188s.854-.5 1.062-.562.188-.438.125-.854-.417-.854-1.167-1.25c-.333.25-.292.541-.167.688s.521.188.542.312-.208.396-.458.584-.208.521-.125.688.187.577-.084.768c-.271.19-.541-.247-.541-.247s-.168.521-.646.021c-.271.334-.541.209-.666.021-.271.271-.688.25-.479-.125s.458-.376.75-.396.687-.082.646-.666-.156-1.177-.562-1.542c-.625-.562-.521-1.229-.521-1.229s-1.042-.104-1.854.459-1.438.562-1.438.562-.459.5-.5.812.146.417.396.5.438.062.062.396-.688.312-.688.312-.019.353.022.561-.084.569-.292.607c-.208.038-.521-.232-.521-.232s-.396.417-.708-.021c-.354.333-.667.209-.792 0-.208.333-.542.188-.333-.188s.5-.418 1-.396.916-.375.729-.896-.354-1.229-.354-1.229-.396-.042-.979-.375c-.729.875-.979.563-1.188.396s-.708-.625-.708-.625-.271-.021-.229.229c-.292-.021-.188-.479-.188-.708s-.083-.5-.25-.5-.417.042-.417.042 0 .082.25.166.229.251-.021.271-.417.082-.229.229.208.229.062.375-.125.541.125.688c.167-.396.479-.166.417.104s-.521.229-.521.229l.312.354-.476.104s-.024.292-.211.354-.229-.438-.229-.438l-.438-.021.292-.354s-.417-.146-.438-.396.312-.125.375 0c.333-.146.229-.479.104-.604s-.042-.229.083-.375.104-.229-.083-.188-.5-.334-.188-.334.375-.021.333-.25c-.375-.041-.146-.333-.146-.333s-.292-.209-.083-.354c-.188-.166-.229-.438-.021-.479-.125-.104.042-.292.042-.292s-.601-.102-.601-.56.521-.375.521-.375-.062-1.458.083-3.5 1-2.75 1.521-2.958c-.542 1.146-.479 3.083-.479 4.271s-.021 2.125-.021 2.125.583.041.541.437-.312.479-.312.479L18 19.833s-.062-1.389.396-1.944c.458-.555 1.166-1.076 1.375-1.243s-.129-.609-.291-.125c-.236-.029-.438-.417-.438-.417s.021.146-.125.25c-.146.104-.104-.354-.188-.312s-.312.167-.604.25c.021-.167.146-.375.146-.375s-.375.041-.709.083c0-.292.187-.771.354-.812-.417-.208-.312-.604-.125-.542s1.062.583 2.042.646c-.312-.354-.562-.812-.562-.812l-.104.354-.375-.354-.042.354s-.917-.667-1.083-1.208.021-.939.333-.896c.604.082.406.645.406.645z" fill="#FFB700"/></svg> \ No newline at end of file |