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/1f469-1f3fe-200d-1f3eb.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/1f469-1f3fe-200d-1f3eb.svg')
-rw-r--r-- | public/emoji/1f469-1f3fe-200d-1f3eb.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f469-1f3fe-200d-1f3eb.svg b/public/emoji/1f469-1f3fe-200d-1f3eb.svg index 70e1044b0..5908aebac 100644 --- a/public/emoji/1f469-1f3fe-200d-1f3eb.svg +++ b/public/emoji/1f469-1f3fe-200d-1f3eb.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="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="M 4,34 C 2.895,34 2,33.105 2,32 L 2,32 2,10 C 2,8.896 2.895,8 4,8 l 0,0 22,0 c 1.104,0 2,0.896 2,2 l 0,0 0,22 c 0,1.105 -0.896,2 -2,2 l 0,0 -22,0 z"/></clipPath><clipPath id="clipPath40" clipPathUnits="userSpaceOnUse"><path id="path42" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath64" clipPathUnits="userSpaceOnUse"><path id="path66" d="M 0,0 36,0 36,36 0,36 0,0 Z"/></clipPath><clipPath id="clipPath116" clipPathUnits="userSpaceOnUse"><path id="path118" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath132" clipPathUnits="userSpaceOnUse"><path id="path134" d="M 0,0 36,0 36,36 0,36 0,0 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(30,10)" id="g20"><path id="path22" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -22,0 c -2.209,0 -4,1.791 -4,4 l 0,22 c 0,2.209 1.791,4 4,4 l 22,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g transform="translate(28,10)" id="g32"><path id="path34" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -22,0 c -1.104,0 -2,0.896 -2,2 l 0,22 c 0,1.105 0.896,2 2,2 l 22,0 c 1.105,0 2,-0.895 2,-2 L 0,0 Z"/></g></g></g><g id="g36"><g clip-path="url(#clipPath40)" id="g38"><g transform="translate(10.5771,27.2217)" id="g44"><path id="path46" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.352,0 0.624,-0.16 0.624,-0.528 0,-0.367 -0.272,-0.528 -0.576,-0.528 l -2.671,0 c -0.351,0 -0.623,0.161 -0.623,0.528 0,0.168 0.104,0.312 0.184,0.408 0.664,0.791 1.383,1.511 1.991,2.391 0.144,0.208 0.279,0.455 0.279,0.743 0,0.328 -0.248,0.616 -0.575,0.616 -0.92,0 -0.48,-1.295 -1.247,-1.295 -0.384,0 -0.584,0.271 -0.584,0.583 0,1.008 0.895,1.815 1.879,1.815 0.983,0 1.775,-0.648 1.775,-1.663 0,-1.111 -1.24,-2.215 -1.919,-3.07 L 0,0 Z"/></g><g transform="translate(4.0898,22.8281)" id="g48"><path id="path50" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0.288 0.184,0.48 0.479,0.48 0.296,0 0.48,-0.192 0.48,-0.48 l 0,-1.16 1.16,0 c 0.296,0 0.48,-0.191 0.48,-0.479 0,-0.288 -0.184,-0.48 -0.48,-0.48 l -1.16,0 0,-1.159 c 0,-0.288 -0.184,-0.48 -0.48,-0.48 C 0.184,-3.758 0,-3.566 0,-3.278 l 0,1.159 -1.159,0 c -0.296,0 -0.48,0.192 -0.48,0.48 0,0.288 0.184,0.479 0.48,0.479 L 0,-1.16 0,0 Z"/></g><g transform="translate(10.5767,20.2217)" id="g52"><path id="path54" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.352,0 0.623,-0.16 0.623,-0.528 0,-0.367 -0.271,-0.528 -0.575,-0.528 l -2.671,0 c -0.351,0 -0.623,0.161 -0.623,0.528 0,0.168 0.104,0.312 0.184,0.408 0.664,0.791 1.383,1.511 1.991,2.391 0.144,0.208 0.279,0.455 0.279,0.743 0,0.328 -0.248,0.616 -0.575,0.616 -0.92,0 -0.48,-1.295 -1.248,-1.295 -0.384,0 -0.583,0.271 -0.583,0.583 0,1.008 0.895,1.815 1.879,1.815 0.983,0 1.774,-0.648 1.774,-1.663 C 0.455,1.959 -0.784,0.855 -1.463,0 L 0,0 Z"/></g><g transform="translate(11.4165,17.0303)" id="g56"><path id="path58" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -8.333,0 c -0.277,0 -0.5,0.224 -0.5,0.5 0,0.276 0.223,0.5 0.5,0.5 L 0,1 C 0.276,1 0.5,0.776 0.5,0.5 0.5,0.224 0.276,0 0,0"/></g></g></g><g id="g60"><g clip-path="url(#clipPath64)" id="g62"><g transform="translate(35,0)" id="g68"><path id="path70" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,3.5 C 0,6.814 -3.686,9 -7,9 l -12,0 c -3.313,0 -7,-2.186 -7,-5.5 L -26,0 0,0 Z"/></g><g transform="translate(21.9443,30.9312)" id="g72"><path id="path74" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.105,0 10.948,-2.053 10.948,-10.948 0,-8.895 0,-10.948 -2.053,-10.948 -2.053,0 -4.79,2.053 -8.895,2.053 -4.105,0 -6.784,-2.053 -8.895,-2.053 -2.287,0 -2.053,8.211 -2.053,10.948 C -10.948,-2.053 -4.105,0 0,0"/></g><g transform="translate(17,9)" id="g76"><path id="path78" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 9.875,0 C 9.875,0 8.619,-3.5 4.937,-3.5 1.256,-3.5 0,0 0,0"/></g><g transform="translate(18.3281,8.9805)" id="g80"><path id="path82" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.48 2.172,-2.48 3.672,-2.48 1.5,0 3.66,1 3.66,2.48 l 0,3.205 L 0,3.205 0,0 Z"/></g><g transform="translate(18.3213,10.8213)" id="g84"><path id="path86" style="fill:#9b6a49;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.023,-1.155 2.291,-1.468 3.669,-1.468 1.379,0 2.647,0.313 3.67,1.468 l 0,2.936 L 0,2.936 0,0 Z"/></g><g transform="translate(13.7339,20.2827)" id="g88"><path id="path90" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.834 3.676,10.563 8.21,10.563 4.535,0 8.211,-4.729 8.211,-10.563 0,-5.833 -3.676,-10.286 -8.211,-10.286 C 3.676,-10.286 0,-5.833 0,0"/></g><g transform="translate(21.9443,12.457)" id="g92"><path id="path94" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.605,0 -2.446,0.794 -2.536,0.885 -0.268,0.266 -0.268,0.7 0,0.967 0.265,0.264 0.692,0.266 0.96,0.006 C -1.541,1.826 -1.023,1.367 0,1.367 1.039,1.367 1.557,1.84 1.577,1.859 1.851,2.115 2.28,2.107 2.54,1.84 2.8,1.571 2.8,1.148 2.536,0.885 2.446,0.794 1.606,0 0,0"/></g><g transform="translate(11.7251,17)" id="g96"><path id="path98" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.021,1 -0.044,0.224 -0.044,0.465 0,3.422 2.053,-0.494 2.053,1.943 0,2.439 1.368,2.683 2.736,4.051 0.685,0.685 2.053,2.026 2.053,2.026 0,0 3.421,-2.067 6.158,-2.067 2.737,0 5.474,-1.375 5.474,-4.112 0,-2.737 2.053,1.584 2.053,-1.837 C 20.483,0.225 20.46,1 20.443,0 l 0.718,0 c 0.007,2 0.007,1.924 0.007,3.202 0,8.895 -6.843,12.207 -10.949,12.207 C 6.114,15.409 -0.728,12.152 -0.728,3.257 -0.728,2.464 -0.748,2 -0.72,0 L 0,0 Z"/></g><g transform="translate(18.6084,18.1138)" id="g100"><path id="path102" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.465,0 -0.846,0.381 -0.846,0.846 l 0,0.845 c 0,0.465 0.381,0.846 0.846,0.846 0.465,0 0.847,-0.381 0.847,-0.846 l 0,-0.845 C 0.847,0.381 0.465,0 0,0"/></g><g transform="translate(25.373,18.1138)" id="g104"><path id="path106" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.465,0 -0.846,0.381 -0.846,0.846 l 0,0.845 c 0,0.465 0.381,0.846 0.846,0.846 0.465,0 0.846,-0.381 0.846,-0.846 l 0,-0.845 C 0.846,0.381 0.465,0 0,0"/></g><g transform="translate(22.8369,15.5)" id="g108"><path id="path110" style="fill:#915a34;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.691,0 c -0.234,0 -0.423,0.189 -0.423,0.423 l 0,0.153 C -2.114,0.81 -1.925,1 -1.691,1 L 0,1 C 0.232,1 0.423,0.81 0.423,0.576 l 0,-0.153 C 0.423,0.189 0.232,0 0,0"/></g></g></g><g id="g112"><g clip-path="url(#clipPath116)" id="g114"><g transform="translate(15.4443,20.0645)" id="g120"><path id="path122" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.734,-2.622 -1.639,-2.622 -0.905,0 -1.639,1.174 -1.639,2.622 0,1.448 0.734,2.623 1.639,2.623 C -0.734,2.623 0,1.448 0,0"/></g><g transform="translate(31.833,20.0645)" id="g124"><path id="path126" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.733,-2.622 -1.639,-2.622 -0.905,0 -1.638,1.174 -1.638,2.622 0,1.448 0.733,2.623 1.638,2.623 C -0.733,2.623 0,1.448 0,0"/></g></g></g><g id="g128"><g clip-path="url(#clipPath132)" id="g130"><g transform="translate(22,5.7783)" id="g136"><path id="path138" style="fill:#744eaa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 3.381,-2.494 4.094,-2.777 4.25,-2.84 3.727,0.879 3.727,0.879 l -7.454,0 c 0,0 -0.523,-3.781 -0.234,-3.625 C -3.32,-2.404 0,0 0,0"/></g><g transform="translate(17.291,10.083)" id="g140"><path id="path142" style="fill:#cbb7ea;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.564,-0.566 4.709,-3.383 4.709,-3.383 0,0 -2.125,-1.242 -4.086,-3.535 -0.195,-0.23 -1.543,4.625 -1.584,5.709 C -0.973,-0.906 -0.271,0.271 0,0"/></g><g transform="translate(26.7305,10.083)" id="g144"><path id="path146" style="fill:#cbb7ea;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.566,-0.566 -4.709,-3.383 -4.709,-3.383 0,0 2.125,-1.242 4.084,-3.535 0.195,-0.23 1.541,4.625 1.582,5.709 C 0.969,-0.906 0.27,0.271 0,0"/></g><path id="path148" style="fill:#744eaa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 23,0 -2,0 0,6 2,0 0,-6 z"/><g transform="translate(23,1.5)" id="g150"><path id="path152" style="fill:#cbb7ea;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.448,-1 -1,-1 -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 0.552,0 1,-0.448 1,-1"/></g><g transform="translate(23,4.5)" id="g154"><path id="path156" style="fill:#cbb7ea;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.448,-1 -1,-1 -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 0.552,0 1,-0.448 1,-1"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#D99E82" d="M30 26c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h22c2.209 0 4 1.791 4 4v22z"/><path fill="#5C913B" d="M28 26c0 1.104-.896 2-2 2H4c-1.104 0-2-.896-2-2V4c0-1.105.896-2 2-2h22c1.104 0 2 .895 2 2v22z"/><path fill="#FFF" d="M7.515 8.898c-.08.096-.184.24-.184.408 0 .368.272.528.624.528h2.67c.304 0 .576-.16.576-.528s-.271-.528-.624-.528H9.114c.679-.855 1.919-1.958 1.919-3.07 0-1.015-.792-1.663-1.775-1.663s-1.879.807-1.879 1.815c0 .311.2.583.584.583.768 0 .328-1.295 1.247-1.295.328 0 .576.288.576.616 0 .288-.136.536-.28.744-.608.879-1.327 1.599-1.991 2.39zm-1.307 5.433H5.049v-1.16c0-.288-.184-.479-.48-.479-.295 0-.479.192-.479.479v1.16H2.931c-.296 0-.48.192-.48.479 0 .288.184.48.48.48H4.09v1.159c0 .288.184.479.479.479.296 0 .48-.191.48-.479V15.29h1.159c.296 0 .48-.192.48-.48 0-.287-.184-.479-.48-.479zm4.369 1.447H9.113c.68-.855 1.919-1.958 1.919-3.07 0-1.015-.792-1.663-1.775-1.663s-1.879.808-1.879 1.815c0 .311.2.583.583.583.768 0 .328-1.295 1.248-1.295.328 0 .576.288.576.616 0 .288-.136.536-.28.744-.608.879-1.327 1.599-1.991 2.391-.08.096-.184.24-.184.408 0 .368.272.528.624.528h2.67c.304 0 .576-.16.576-.528 0-.369-.271-.529-.623-.529zm.84 3.192H3.083c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h8.333c.276 0 .5.224.5.5.001.276-.223.5-.499.5z"/><path fill="#9266CC" d="M35 36v-3.5c0-3.314-3.685-5.5-7-5.5H16c-3.313 0-7 2.186-7 5.5V36h26z"/><path fill="#60352A" d="M21.944 5.069c4.106 0 10.948 2.053 10.948 10.948s0 10.948-2.053 10.948c-2.054 0-4.79-2.053-8.896-2.053-4.105 0-6.784 2.053-8.895 2.053-2.287 0-2.053-8.211-2.053-10.948.002-8.895 6.844-10.948 10.949-10.948"/><path fill="#292F33" d="M17 27h9.875s-1.256 3.5-4.938 3.5S17 27 17 27"/><path fill="#AF7E57" d="M18.328 27.02c0 1.48 2.172 2.48 3.672 2.48s3.66-1 3.66-2.48v-3.205h-7.332v3.205z"/><path fill="#9B6A49" d="M18.321 25.179c1.023 1.155 2.291 1.468 3.669 1.468 1.379 0 2.647-.312 3.67-1.468v-2.936h-7.339v2.936z"/><path fill="#AF7E57" d="M13.734 15.717c0-5.834 3.676-10.563 8.21-10.563 4.534 0 8.211 4.729 8.211 10.563 0 5.833-3.677 10.286-8.211 10.286-4.534 0-8.21-4.452-8.21-10.286"/><path fill="#DF1F32" d="M21.944 23.543c-1.605 0-2.446-.794-2.536-.885-.268-.267-.268-.7 0-.967.266-.265.692-.267.96-.007.035.032.553.491 1.576.491 1.039 0 1.557-.473 1.577-.492.273-.256.703-.248.963.02.26.269.26.691-.004.955-.089.091-.929.885-2.536.885"/><path fill="#60352A" d="M11.725 19c-.021-1-.044-.224-.044-.465 0-3.422 2.053.494 2.053-1.943 0-2.439 1.368-2.683 2.736-4.051.685-.685 2.053-2.026 2.053-2.026s3.421 2.067 6.158 2.067c2.736 0 5.474 1.375 5.474 4.112s2.053-1.584 2.053 1.837c0 .244-.022-.531-.04.469h.718c.007-2 .007-1.924.007-3.202 0-8.895-6.843-12.207-10.948-12.207S10.998 6.848 10.998 15.743c0 .793-.02 1.257.008 3.257h.719z"/><path fill="#60352A" d="M18.608 17.886c-.465 0-.846-.381-.846-.846v-.845c0-.465.381-.846.846-.846s.847.381.847.846v.845c0 .465-.382.846-.847.846m6.765 0c-.465 0-.846-.381-.846-.846v-.845c0-.465.381-.846.846-.846.465 0 .846.381.846.846v.845c0 .465-.381.846-.846.846"/><path fill="#915A34" d="M22.837 20.5h-1.691c-.233 0-.423-.19-.423-.423v-.153c0-.233.189-.424.423-.424h1.691c.232 0 .423.19.423.424v.153c0 .233-.191.423-.423.423"/><path fill="#AF7E57" d="M15.444 15.936c0 1.448-.734 2.622-1.639 2.622s-1.639-1.174-1.639-2.622.734-2.623 1.639-2.623c.905-.001 1.639 1.174 1.639 2.623m16.389 0c0 1.448-.733 2.622-1.639 2.622-.905 0-1.639-1.174-1.639-2.622s.733-2.623 1.639-2.623c.906-.001 1.639 1.174 1.639 2.623"/><path fill="#744EAA" d="M22 30.222s3.381 2.494 4.094 2.777c.156.062-.367-3.656-.367-3.656h-7.453s-.523 3.781-.234 3.625c.64-.342 3.96-2.746 3.96-2.746"/><path fill="#CBB7EA" d="M17.291 25.917C17.855 26.483 22 29.3 22 29.3s-2.125 1.242-4.086 3.535c-.195.23-1.543-4.625-1.584-5.709-.012-.303.69-1.48.961-1.209m9.439 0c-.566.566-4.709 3.383-4.709 3.383s2.125 1.242 4.084 3.535c.195.23 1.541-4.625 1.582-5.709.012-.303-.687-1.48-.957-1.209"/><path fill="#744EAA" d="M21 30h2v6h-2z"/><circle fill="#CBB7EA" cx="22" cy="34.5" r="1"/><circle fill="#CBB7EA" cx="22" cy="31.5" r="1"/></svg> \ No newline at end of file |