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-1f1f9.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-1f1f9.svg')
-rw-r--r-- | public/emoji/1f1f2-1f1f9.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1f2-1f1f9.svg b/public/emoji/1f1f2-1f1f9.svg index 98a364da9..553810216 100644 --- a/public/emoji/1f1f2-1f1f9.svg +++ b/public/emoji/1f1f2-1f1f9.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="clipPath76" clipPathUnits="userSpaceOnUse"><path id="path78" d="m 4.87793,26.1221 2.30859,0 0,-2.3086 -2.30859,0 0,2.3086 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(32,31)" id="g20"><path id="path22" style="fill:#cf142b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -14,0 0,-26 14,0 c 2.209,0 4,1.791 4,4 L 4,-4 C 4,-1.791 2.209,0 0,0"/></g><g transform="translate(4,31)" id="g24"><path id="path26" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-18 c 0,-2.209 1.791,-4 4,-4 l 14,0 0,26 -14,0 z"/></g><path id="path28" style="fill:#cf142b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 10.346,23.656 -8.691,0 0,2.688 8.691,0 0,-2.688 z"/><path id="path30" style="fill:#cf142b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 7.344,20.654 -2.688,0 0,8.691 2.688,0 0,-8.691 z"/><g transform="translate(5.6294,23.729)" id="g32"><path id="path34" style="fill:#cf142b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.509 -0.412,-0.922 -0.921,-0.922 -0.508,0 -0.921,0.413 -0.921,0.922 0,0.508 0.413,0.921 0.921,0.921 C -0.412,0.921 0,0.508 0,0"/></g><g transform="translate(8.2764,23.7598)" id="g36"><path id="path38" style="fill:#cf142b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.509 -0.413,-0.922 -0.921,-0.922 -0.509,0 -0.921,0.413 -0.921,0.922 0,0.508 0.412,0.921 0.921,0.921 C -0.413,0.921 0,0.508 0,0"/></g><g transform="translate(5.6309,26.1758)" id="g40"><path id="path42" style="fill:#cf142b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.509 -0.412,-0.921 -0.922,-0.921 -0.508,0 -0.92,0.412 -0.92,0.921 0,0.508 0.412,0.921 0.92,0.921 C -0.412,0.921 0,0.508 0,0"/></g><g transform="translate(8.2764,26.1758)" id="g44"><path id="path46" style="fill:#cf142b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.509 -0.413,-0.921 -0.921,-0.921 -0.509,0 -0.921,0.412 -0.921,0.921 0,0.508 0.412,0.921 0.921,0.921 C -0.413,0.921 0,0.508 0,0"/></g><g transform="translate(5.417,23.729)" id="g48"><path id="path50" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.391 -0.317,-0.708 -0.708,-0.708 -0.392,0 -0.709,0.317 -0.709,0.708 0,0.391 0.317,0.708 0.709,0.708 C -0.317,0.708 0,0.391 0,0"/></g><g transform="translate(8.064,23.7598)" id="g52"><path id="path54" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.391 -0.317,-0.708 -0.708,-0.708 -0.392,0 -0.709,0.317 -0.709,0.708 0,0.391 0.317,0.709 0.709,0.709 C -0.317,0.709 0,0.391 0,0"/></g><g transform="translate(5.4185,26.1758)" id="g56"><path id="path58" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.391 -0.317,-0.708 -0.709,-0.708 -0.391,0 -0.708,0.317 -0.708,0.708 0,0.391 0.317,0.708 0.708,0.708 C -0.317,0.708 0,0.391 0,0"/></g><g transform="translate(8.064,26.1758)" id="g60"><path id="path62" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.391 -0.317,-0.708 -0.708,-0.708 -0.392,0 -0.709,0.317 -0.709,0.708 0,0.391 0.317,0.708 0.709,0.708 C -0.317,0.708 0,0.391 0,0"/></g><g transform="translate(7.8491,24.9678)" id="g64"><path id="path66" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.003 -0.813,-1.817 -1.817,-1.817 -1.003,0 -1.817,0.814 -1.817,1.817 0,1.003 0.814,1.817 1.817,1.817 C -0.813,1.817 0,1.003 0,0"/></g><path id="path68" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 7,21 -2,0 0,8 2,0 0,-8 z"/><path id="path70" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 10,24 -8,0 0,2 8,0 0,-2 z"/><g id="g72"><g id="g74"/><g id="g80"><g style="opacity:0.5" id="g82" clip-path="url(#clipPath76)"><g id="g84" transform="translate(7.1865,24.9678)"><path id="path86" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.637 -0.517,-1.154 -1.154,-1.154 -0.638,0 -1.155,0.517 -1.155,1.154 0,0.637 0.517,1.154 1.155,1.154 C -0.517,1.154 0,0.637 0,0"/></g></g></g></g><g transform="translate(6.6475,24.9771)" id="g88"><path id="path90" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.015,0.017 0.032,0.032 0.048,0.047 0.051,0.05 0.054,0.052 0.057,0.055 0.1,0.034 0.14,0.007 0.18,-0.018 0.26,-0.067 0.514,0.048 0.398,0.119 0.3,0.18 0.201,0.251 0.078,0.23 -0.013,0.214 -0.091,0.167 -0.16,0.107 c -0.008,0.062 -0.015,0.124 -0.028,0.185 0.018,0.02 0.03,0.042 0.025,0.069 -0.011,0.058 0.02,0.121 0.04,0.175 0.01,0.026 -0.003,0.044 -0.024,0.055 0.008,0.013 0.016,0.025 0.024,0.037 C -0.088,0.616 -0.052,0.604 -0.015,0.597 0.048,0.584 0.131,0.61 0.181,0.649 0.227,0.686 0.211,0.722 0.158,0.733 0.064,0.751 -0.023,0.8 -0.11,0.838 -0.168,0.863 -0.253,0.837 -0.305,0.809 -0.338,0.79 -0.389,0.742 -0.336,0.716 -0.342,0.71 -0.349,0.497 -0.352,0.49 -0.396,0.394 -0.471,1.023 -0.521,0.023 l -0.019,0 c -0.016,0 -0.141,0.345 -0.134,0.414 0.074,0.015 0.027,0.264 0.027,0.315 l 0,0.029 c 0,0.014 0.113,0.025 0.105,0.033 0.03,0.019 0.116,0.045 0.09,0.067 -0.042,0.035 -0.1,0.012 -0.146,-0.006 -0.014,0.007 -0.014,0.012 -0.028,0.014 -0.01,0.001 -0.014,0 -0.024,0 0.054,0.022 0.1,0.058 0.087,0.098 -0.008,0.026 -0.014,0.046 0,0.071 0.067,0.115 -0.21,0.089 -0.257,0.008 C -0.849,1.015 -0.854,0.97 -0.836,0.913 -0.824,0.875 -0.776,0.863 -0.723,0.868 -0.751,0.853 -0.776,0.831 -0.791,0.802 -0.792,0.799 -0.792,0.796 -0.794,0.793 -0.836,0.793 -0.884,0.78 -0.913,0.768 -1.074,0.699 -1.243,0.649 -1.395,0.559 -1.419,0.544 -1.488,0.496 -1.425,0.476 -1.387,0.464 -1.338,0.47 -1.294,0.483 -1.292,0.477 -1.292,0.47 -1.288,0.464 c 0.039,-0.051 0.097,-0.098 0.154,-0.126 0.061,-0.03 0.142,-0.013 0.197,0.023 0.036,0.023 0.075,0.08 0.03,0.112 0.017,0.024 0.043,0.043 0.068,0.061 C -0.836,0.47 -0.828,0.406 -0.812,0.35 -0.808,0.334 -0.799,0.322 -0.789,0.312 -0.822,0.305 -0.854,0.292 -0.879,0.277 -0.912,0.257 -0.951,0.212 -0.92,0.181 -0.991,0.168 -1.06,0.15 -1.125,0.119 -1.15,0.108 -1.205,0.076 -1.211,0.042 -1.243,0.038 -1.275,0.035 -1.307,0.029 -1.358,0.021 -1.441,-0.003 -1.46,-0.061 c -0.024,-0.001 -0.052,-0.006 -0.072,-0.011 -0.059,-0.008 -0.17,-0.034 -0.175,-0.086 -0.008,-0.092 0.039,-0.166 0.079,-0.245 -0.037,-0.036 -0.063,-0.077 -0.075,-0.132 -0.024,-0.119 0.257,-0.076 0.278,0.029 0.003,0.016 0.005,0.032 0.019,0.043 0.034,0.025 0.07,0.073 0.038,0.108 0.012,0.009 0.02,0.018 0.016,0.025 -0.035,0.068 -0.072,0.134 -0.077,0.21 0.015,-0.005 0.032,-0.009 0.048,-0.01 0.019,-0.102 0.096,-0.192 0.171,-0.26 0.018,-0.015 0.051,-0.017 0.087,-0.012 -0.014,-0.012 -0.027,-0.026 -0.034,-0.042 -0.034,-0.086 -0.048,-0.173 -0.059,-0.264 -0.004,-0.037 0.024,-0.073 0.06,-0.081 0.116,-0.027 0.209,-0.083 0.303,-0.154 0.097,-0.074 0.339,0.062 0.213,0.158 -0.089,0.068 -0.183,0.124 -0.288,0.16 0.007,0.051 0.015,0.102 0.035,0.149 0.007,0.018 0.009,0.034 0.007,0.048 0.023,0.009 0.045,0.018 0.065,0.031 0.178,0.107 0.396,0.131 0.587,0.218 -0.009,-0.029 0.009,-0.055 0.049,-0.065 0.081,-0.019 0.231,-0.017 0.258,-0.112 0.027,-0.095 -0.005,-0.209 0.056,-0.293 0.056,-0.078 0.323,0.016 0.256,0.109 -0.024,0.032 -0.019,0.095 -0.021,0.133 -0.004,0.059 -0.006,0.12 -0.034,0.175 -0.057,0.107 -0.243,0.116 -0.347,0.141 -0.035,0.008 -0.076,0.054 -0.114,0.043 0,0.007 -0.007,0.071 -0.024,0.071 l -0.006,0 c 0.001,0 0.001,-0.048 0.002,-0.047 C -0.098,-0.021 -0.039,-0.047 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CF142B" d="M32 5H18v26h14c2.209 0 4-1.791 4-4V9c0-2.209-1.791-4-4-4z"/><path fill="#EEE" d="M4 5C1.791 5 0 6.791 0 9v18c0 2.209 1.791 4 4 4h14V5H4z"/><path fill="#CF142B" d="M1.654 9.656h8.691v2.688H1.654z"/><path fill="#CF142B" d="M4.656 6.654h2.688v8.691H4.656z"/><g fill="#CF142B"><circle cx="4.71" cy="12.271" r=".921"/><circle cx="7.355" cy="12.271" r=".921"/><circle cx="4.71" cy="9.824" r=".921"/><circle cx="7.355" cy="9.824" r=".921"/></g><g fill="#99AAB5"><circle cx="4.708" cy="12.271" r=".708"/><circle cx="7.355" cy="12.271" r=".708"/><circle cx="4.708" cy="9.824" r=".708"/><circle cx="7.355" cy="9.824" r=".708"/></g><circle fill="#CCD6DD" cx="6.032" cy="11.032" r="1.817"/><path fill="#CCD6DD" d="M5 7h2v8H5z"/><path fill="#CCD6DD" d="M2 10h8v2H2z"/><circle fill="#B2C0C9" cx="6.032" cy="11.083" r="1.204"/><path fill="#99AAB5" d="M6.647 11.023c.015-.017.032-.032.048-.047l.009-.007c.042.021.083.047.123.072.08.049.334-.066.219-.137-.099-.061-.198-.132-.32-.111-.091.016-.169.063-.238.122-.008-.062-.015-.123-.029-.184.019-.02.03-.042.025-.069-.011-.058.021-.122.041-.175.01-.026-.004-.044-.025-.055.009-.012.016-.024.024-.037.035.012.071.023.108.031.063.013.146-.013.195-.052.046-.036.031-.073-.022-.083-.094-.019-.181-.067-.269-.105-.058-.025-.143.001-.194.029-.033.018-.084.066-.031.092-.006.006-.013.22-.016.227-.044.095-.118-.534-.169.466h-.018c-.017 0-.141-.345-.134-.414.074-.015.026-.264.026-.315v-.029c0-.015.113-.025.105-.033.03-.019.117-.045.09-.067-.042-.035-.1-.011-.146.007-.014-.007-.014-.012-.028-.014-.01-.002-.013 0-.023 0 .054-.022.1-.058.086-.099-.008-.025-.014-.045 0-.07.067-.116-.21-.09-.257-.009-.029.051-.035.097-.017.153.012.038.061.051.113.046-.028.015-.053.037-.068.065l-.003.009c-.042 0-.09.013-.119.025-.161.069-.331.119-.482.209-.025.015-.094.063-.031.083.038.012.087.006.131-.007.002.007.002.013.006.019.039.051.096.098.154.126.061.03.142.013.196-.023.036-.023.075-.081.03-.112.017-.025.043-.043.068-.061.003.064.011.127.027.184.004.016.013.028.023.038-.033.006-.065.019-.09.034-.033.02-.072.065-.042.096-.07.013-.139.031-.205.062-.025.011-.08.043-.085.078l-.096.012c-.051.008-.135.032-.153.09-.024.001-.052.006-.072.011-.059.008-.17.034-.175.086-.008.092.038.167.078.245-.037.036-.063.078-.074.132-.024.119.256.077.277-.029.003-.016.005-.032.019-.042.035-.025.07-.074.039-.108.012-.01.02-.018.016-.025-.035-.068-.072-.134-.077-.21.015.006.031.009.047.01.019.102.097.192.171.26.018.016.051.018.087.013-.015.012-.028.025-.034.042-.034.085-.048.173-.059.263-.004.037.024.073.06.082.116.027.209.082.303.154.097.074.339-.062.213-.159-.088-.067-.183-.123-.288-.159.007-.051.016-.102.035-.15.007-.018.009-.034.007-.047.023-.009.045-.019.065-.031.178-.108.396-.131.587-.218-.008.028.009.055.049.064.082.019.231.018.258.112.027.095-.005.209.056.293.056.078.323-.016.256-.109-.023-.032-.019-.095-.021-.133-.003-.059-.006-.121-.034-.175-.057-.108-.242-.116-.346-.141-.036-.008-.076-.055-.114-.043.003-.007-.003-.071-.021-.071h-.006c.001 0 .001.048.002.047.061-.004.12.023.159-.024z"/></svg> \ No newline at end of file |