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-1f3fb-200d-1f52c.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-1f3fb-200d-1f52c.svg')
-rw-r--r-- | public/emoji/1f469-1f3fb-200d-1f52c.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f469-1f3fb-200d-1f52c.svg b/public/emoji/1f469-1f3fb-200d-1f52c.svg index 95fbcb49b..a2a080b0f 100644 --- a/public/emoji/1f469-1f3fb-200d-1f52c.svg +++ b/public/emoji/1f469-1f3fb-200d-1f52c.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 0,0 36,0 36,36 0,36 0,0 Z"/></clipPath><clipPath id="clipPath92" clipPathUnits="userSpaceOnUse"><path id="path94" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath128" clipPathUnits="userSpaceOnUse"><path id="path130" d="m 15,23 14,0 0,-5 -14,0 0,5 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(34.9414,0)" id="g20"><path id="path22" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,4.488 c 0,3.315 -3.686,5.5 -7,5.5 l -12,0 c -3.313,0 -7,-2.185 -7,-5.5 L -26,0 0,0 Z"/></g><g transform="translate(21.8867,31.9189)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.104,0 10.947,-2.053 10.947,-10.947 0,-8.896 0,-10.948 -2.052,-10.948 -2.053,0 -4.791,2.052 -8.895,2.052 -4.105,0 -6.785,-2.052 -8.896,-2.052 -2.287,0 -2.053,8.211 -2.053,10.948 C -10.949,-2.053 -4.105,0 0,0"/></g><g transform="translate(18.2695,7.5098)" id="g28"><path id="path30" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.466,-1.064 3.061,-0.437 3.769,-0.437 0.708,0 2.097,-0.627 3.563,0.437 l 0,5.664 L 0,5.664 0,0 Z"/></g><g transform="translate(18.2637,11.8105)" id="g32"><path id="path34" style="fill:#eec2ad;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.022,-1.156 2.29,-1.469 3.668,-1.469 1.379,0 2.647,0.313 3.67,1.469 l 0,2.936 L 0,2.936 0,0 Z"/></g><g transform="translate(13.6753,21.2705)" id="g36"><path id="path38" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,5.834 3.676,10.563 8.211,10.563 12.745,10.563 16.42,5.834 16.42,0 16.42,-5.833 12.745,-10.284 8.211,-10.284 3.676,-10.284 0,-5.833 0,0"/></g><g transform="translate(21.8867,13.4453)" id="g40"><path id="path42" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.606,0 -2.447,0.795 -2.537,0.885 -0.268,0.267 -0.268,0.701 0,0.967 0.266,0.265 0.692,0.267 0.961,0.007 C -1.541,1.826 -1.025,1.367 0,1.367 1.038,1.367 1.555,1.84 1.576,1.859 1.85,2.115 2.279,2.107 2.539,1.84 2.799,1.572 2.799,1.148 2.535,0.885 2.445,0.795 1.605,0 0,0"/></g><g transform="translate(11.6665,17.9883)" id="g44"><path id="path46" style="fill:#292f33;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.737,4.051 0.684,0.685 2.052,2.026 2.052,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.719,0 c 0.005,2 0.005,1.924 0.005,3.202 0,8.895 -6.841,12.207 -10.948,12.207 C 6.115,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.5498,19.1016)" id="g48"><path id="path50" style="fill:#662113;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.847 l 0,0.844 c 0,0.465 0.381,0.846 0.846,0.846 0.466,0 0.847,-0.381 0.847,-0.846 l 0,-0.844 C 0.847,0.381 0.466,0 0,0"/></g><g transform="translate(25.3145,19.1016)" id="g52"><path id="path54" style="fill:#662113;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.847 l 0,0.844 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.844 C 0.846,0.381 0.465,0 0,0"/></g><g transform="translate(22.7773,16.4883)" id="g56"><path id="path58" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.69,0 c -0.234,0 -0.423,0.189 -0.423,0.424 l 0,0.152 C -2.113,0.811 -1.924,1 -1.69,1 L 0,1 C 0.233,1 0.424,0.811 0.424,0.576 l 0,-0.152 C 0.424,0.189 0.233,0 0,0"/></g><g transform="translate(19,0)" id="g60"><path id="path62" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.059,9.219 c 0,0 1.411,-1.645 4,-1.645 2.59,0 4.219,1.645 4.219,1.645 L 5.937,0 3.021,0 0,0 Z"/></g><g transform="translate(17.9414,10.75)" id="g64"><path id="path66" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.566,-0.566 2.919,-10.75 2.919,-10.75 l -3.156,0 -1.704,2.562 1.704,2.835 -2.017,0.634 0.254,3.957 c 0,0 1.729,1.033 2,0.762"/></g><g transform="translate(25.9346,10.75)" id="g68"><path id="path70" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.566,-0.566 -2.919,-10.75 -2.919,-10.75 l 3.156,0 1.704,2.562 -1.704,2.835 2.017,0.634 L 2,-0.762 C 2,-0.762 0.27,0.271 0,0"/></g></g></g><g id="g72"><g clip-path="url(#clipPath76)" id="g74"><g transform="translate(15.3857,21.0527)" id="g80"><path id="path82" style="fill:#f7dece;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.7744,21.0527)" id="g84"><path id="path86" style="fill:#f7dece;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="g88"><g clip-path="url(#clipPath92)" id="g90"><g transform="translate(2,0)" id="g96"><path id="path98" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -2,0 -2,2 0,0.179 0.117,0.896 1,2 l 4,5 0,5 c 0,0 -2,0 -2,2 0,2 2,2 2,2 l 5,0 c 0,0 2,0 2,-2 0,-2 -2,-2 -2,-2 L 8,9 12,4 C 13.153,2.559 13,2.134 13,2 13,0 11,0 11,0 L 0,0 Z"/></g><g transform="translate(0.5312,1.7813)" id="g100"><path id="path102" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.969,-1.312 13,-1.312 14,0.469 10.906,4.5 2.5,4.5 0,0.156"/></g><g transform="translate(8,25)" id="g104"><path id="path106" style="fill:#9266cc;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(10,20)" id="g108"><path id="path110" style="fill:#9266cc;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(7,21.5)" id="g112"><path id="path114" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.829 -0.671,-1.5 -1.5,-1.5 -2.329,-1.5 -3,-0.829 -3,0 -3,0.829 -2.329,1.5 -1.5,1.5 -0.671,1.5 0,0.829 0,0"/></g><g transform="translate(10,18)" id="g116"><path id="path118" style="fill:#a8bccc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5,0 c 0,0 -2,0 -2,-2 0,-2 2,-2 2,-2 l 0,-5 -4,-5 c -0.883,-1.104 -1,-1.821 -1,-2 0,-2 2,-2 2,-2 l 11,0 c 0,0 2,0 2,2 0,0.134 0.153,0.559 -1,2 l -4,5 0,5 c 0,0 2,0 2,2 C 2,0 0,0 0,0 M -0.008,-1 C 0.453,-1.013 1,-1.197 1,-2 1,-2.806 0.45,-2.988 0,-3 l -1,0 0,-1 0,-5 0,-0.351 0.219,-0.274 4,-5 c 0.733,-0.915 0.787,-1.249 0.787,-1.252 L 4,-15.959 4,-16 c 0,-0.806 -0.55,-0.988 -1,-1 l -10.988,0 c -0.462,0.012 -1.012,0.194 -1.013,0.966 0,0.005 0.063,0.51 0.782,1.409 l 4,5 L -4,-9.351 -4,-9 -4,-4 -4.014,-3.024 -4.988,-3 C -5.45,-2.988 -6,-2.806 -6,-2 c 0,0.806 0.55,0.988 1,1 l 4.992,0"/></g><g transform="translate(29,20)" id="g120"><path id="path122" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.325 -0.852,-2 -3,-2 -1.539,0 -2.804,1 -4,1 -1.196,0 -2.461,-1 -4,-1 -2.148,0 -3,0.675 -3,2 l 0,3 14,0 0,-3 z m 0,4 -14,0 c -1,0 -1,-1 -1,-1 l 0,-4 c 0,-1.461 2.333,-2 4,-2 1.667,0 2.599,1 4,1 1.401,0 2.333,-1 4,-1 1.667,0 4,0.539 4,2 L 1,3 C 1,4 0,4 0,4"/></g><g id="g124"><g id="g126"/><g id="g132"><g style="opacity:0.39999402" id="g134" clip-path="url(#clipPath128)"><g id="g136" transform="translate(15,20)"><path id="path138" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,3 14,0 0,-5 -7,0 -7,0 0,2 z"/></g></g></g></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M34.941 36v-4.488c0-3.314-3.685-5.5-7-5.5h-12c-3.313 0-7 2.186-7 5.5V36h26z"/><path fill="#292F33" d="M21.887 4.081c4.104 0 10.947 2.053 10.947 10.947 0 8.895 0 10.948-2.053 10.948s-4.79-2.053-8.895-2.053c-4.105 0-6.785 2.053-8.895 2.053-2.287 0-2.053-8.211-2.053-10.948 0-8.894 6.843-10.947 10.949-10.947"/><path fill="#F7DECE" d="M18.27 28.49c1.466 1.064 5.866 1.064 7.332 0v-5.664H18.27v5.664z"/><path fill="#EEC2AD" d="M18.264 24.19c1.022 1.156 2.29 1.469 3.668 1.469 1.379 0 2.647-.312 3.67-1.469v-2.936h-7.338v2.936z"/><path fill="#F7DECE" d="M13.675 14.729c0-5.834 3.676-10.563 8.211-10.563 4.533 0 8.209 4.73 8.209 10.563s-3.676 10.284-8.209 10.284c-4.534.001-8.211-4.451-8.211-10.284"/><path fill="#DF1F32" d="M21.887 22.555c-1.606 0-2.447-.795-2.537-.885-.268-.268-.268-.701 0-.967.266-.266.692-.268.961-.008.035.033.551.492 1.576.492 1.038 0 1.555-.473 1.576-.492.273-.256.703-.248.963.02s.26.691-.004.955c-.09.09-.93.885-2.535.885"/><path fill="#292F33" d="M11.667 18.012c-.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-.684 2.053-2.026 2.053-2.026s3.421 2.067 6.158 2.067c2.736 0 5.474 1.375 5.474 4.112 0 2.736 2.053-1.584 2.053 1.837 0 .244-.022-.531-.04.469h.719c.006-2 .006-1.924.006-3.202 0-8.895-6.842-12.207-10.948-12.207-4.104 0-10.947 3.257-10.947 12.152 0 .793-.02 1.257.008 3.257h.719z"/><path fill="#F7DECE" d="M15.386 14.947c0 1.448-.734 2.622-1.639 2.622s-1.639-1.174-1.639-2.622.734-2.623 1.639-2.623 1.639 1.175 1.639 2.623m16.388 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.623 1.639 1.175 1.639 2.623"/><path fill="#662113" d="M18.55 16.898c-.465 0-.846-.381-.846-.847v-.845c0-.465.381-.846.846-.846.466 0 .847.381.847.846v.845c-.001.467-.381.847-.847.847m6.765 0c-.465 0-.846-.381-.846-.847v-.845c0-.465.381-.846.846-.846.465 0 .846.381.846.846v.845c-.001.467-.382.847-.846.847"/><path fill="#C1694F" d="M22.777 19.512h-1.69c-.233 0-.423-.189-.423-.424v-.152c0-.234.189-.424.423-.424h1.69c.233 0 .424.19.424.424v.152c0 .234-.19.424-.424.424"/><path fill="#66757F" d="M19 36l-1.059-9.219s1.41 1.645 4 1.645 4.219-1.645 4.219-1.645L24.938 36H19z"/><path fill="#F5F8FA" d="M17.941 25.25C18.508 25.816 20.86 36 20.86 36h-3.156L16 33.438l1.704-2.835-2.017-.634.254-3.957s1.729-1.033 2-.762m7.994 0c-.567.566-2.919 10.75-2.919 10.75h3.156l1.704-2.562-1.704-2.835 2.017-.634-.254-3.957s-1.73-1.033-2-.762"/><path opacity=".4" fill="#FFF" d="M14.753 12.75h14.5V18h-14.5z"/><path fill="#F5F8FA" d="M29 12H15c-1 0-1 1-1 1v4c0 1.461 2.333 2 4 2s2.599-1 4-1 2.333 1 4 1 4-.539 4-2v-4c0-1.001-1-1-1-1zm0 4c0 1.325-.852 2-3 2-1.539 0-2.804-1-4-1s-2.461 1-4 1c-2.148 0-3-.675-3-2v-3h14v3z"/><circle fill="#9266CC" cx="7" cy="11" r="1"/><circle fill="#9266CC" cx="9" cy="16" r="1"/><circle fill="#9266CC" cx="5.5" cy="14.5" r="1.5"/><path fill="#A8BCCC" d="M10 18H5s-2 0-2 2 2 2 2 2v5l-4 5c-.883 1.104-1 1.821-1 2 0 2 2 2 2 2h11s2 0 2-2c0-.134.153-.559-1-2l-4-5v-5s2 0 2-2-2-2-2-2z"/><path fill="#E1E8ED" d="M9 27.351V21h1c.449-.012 1-.194 1-1 0-.803-.547-.987-1.008-1H5c-.45.012-1 .194-1 1s.55.988 1.012 1l.975.024L6 27.351l-1.894 2.368 3.394 3.5 3.394-3.5L9 27.351z"/><path fill="#9266CC" d="M.999 34.034c.001.772.551.954 1.013.966H13c.449-.012 1-.194 1-1v-.041l.006-.082c0-.003-.055-.337-.787-1.252l-2.325-2.906H4.106l-2.325 2.906c-.719.899-.782 1.404-.782 1.409z"/></svg> \ No newline at end of file |