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/1f9db-1f3fc-200d-2642-fe0f.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/1f9db-1f3fc-200d-2642-fe0f.svg')
-rw-r--r-- | public/emoji/1f9db-1f3fc-200d-2642-fe0f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f9db-1f3fc-200d-2642-fe0f.svg b/public/emoji/1f9db-1f3fc-200d-2642-fe0f.svg index 977d04020..fe6e755e1 100644 --- a/public/emoji/1f9db-1f3fc-200d-2642-fe0f.svg +++ b/public/emoji/1f9db-1f3fc-200d-2642-fe0f.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(32,0)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,2 c 0,3.314 -2.686,6 -6,6 l -16,0 c -3.313,0 -6,-2.686 -6,-6 l 0,-2 28,0 z"/></g><g transform="translate(10,8)" id="g24"><path id="path26" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,4 -7,7 -7,11 0,0 1,5 15,5 L 8,-4 c 0,0 -6,1 -8,4"/></g><g transform="translate(26,8)" id="g28"><path id="path30" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,4 7,7 7,11 0,0 -3.667,5 -15,5 l 0,-20 c 0,0 6,1 8,4"/></g><g transform="translate(13.6397,7.899)" id="g32"><path id="path34" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.744,-1.267 2.848,-1.962 4.36,-1.962 1.512,0 2.616,0.696 4.36,1.962 l 0,3.811 L 0,3.811 0,0 Z"/></g><g transform="translate(13.6318,10.0272)" id="g36"><path id="path38" style="fill:#e2c196;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.216,-1.374 2.724,-1.746 4.364,-1.746 1.639,0 3.147,0.373 4.364,1.746 l 0,3.491 L 0,3.491 0,0 Z"/></g><g transform="translate(9.4777,19.0403)" id="g40"><path id="path42" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.589 3.816,10.121 8.522,10.121 4.707,0 8.523,-4.532 8.523,-10.121 0,-5.589 -3.816,-10.12 -8.523,-10.12 C 3.816,-10.12 0,-5.589 0,0"/></g><g transform="translate(18,11)" id="g44"><path id="path46" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.754,0 -3.6,1.904 -3.741,2.045 -0.256,0.257 -0.256,0.671 0,0.927 0.248,0.249 0.645,0.256 0.902,0.024 C -2.787,2.958 -2.118,2.509 0,2.509 c 2.2,0 2.836,0.485 2.842,0.49 C 3.098,3.253 3.499,3.241 3.755,2.985 4.011,2.729 3.997,2.302 3.741,2.045 3.6,1.904 2.754,0 0,0"/></g><g transform="translate(14,19)" id="g48"><path id="path50" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.55,0 -1,0.45 -1,1 l 0,1 c 0,0.55 0.45,1 1,1 L 0,3 C 0.55,3 1,2.55 1,2 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(22,19)" id="g52"><path id="path54" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.55,0 -1,0.45 -1,1 l 0,1 c 0,0.55 0.45,1 1,1 L 0,3 C 0.55,3 1,2.55 1,2 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(18.75,16.25)" id="g56"><path id="path58" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.5,0 c -0.413,0 -0.75,0.337 -0.75,0.75 0,0.413 0.337,0.75 0.75,0.75 L 0,1.5 C 0.413,1.5 0.75,1.163 0.75,0.75 0.75,0.337 0.413,0 0,0"/></g><g transform="translate(26,20)" id="g60"><path id="path62" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.47,-0.129 c 0,0 -1.192,-3.4 -0.001,-3.996 C 2.194,-5.457 3,-0.332 3,1 3,2 0,0 0,0"/></g><g transform="translate(10,20)" id="g64"><path id="path66" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.47,-0.129 c 0,0 1.192,-3.4 0.001,-3.996 C -2.194,-5.457 -3,-0.332 -3,1 -3,2 0,0 0,0"/></g><g transform="translate(18,24)" id="g68"><path id="path70" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,9 c -8,0 -9,-4 -9,-10 0,-6 1.757,-0.97 2,0 1,4 5,5 7,1"/></g><g transform="translate(18,24)" id="g72"><path id="path74" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2,4 6,3 7,-1 7.243,-1.97 9,-7 9,-1 9,5 8,9 0,9"/></g><g transform="translate(12,4.9009)" id="g76"><path id="path78" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,-2 C 0,-2.796 0.748,-3.38 1.521,-3.187 L 6,-1 1.365,1.066 C 0.672,1.239 0,0.715 0,0"/></g><g transform="translate(15.5664,13.5)" id="g80"><path id="path82" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.331,0 -0.637,-0.149 -0.84,-0.41 -0.204,-0.261 -0.274,-0.594 -0.194,-0.915 0.008,-0.034 0.02,-0.066 0.035,-0.098 l 1.012,-2.072 c 0.084,-0.172 0.259,-0.28 0.45,-0.28 0.002,0 0.005,0 0.008,0 0.195,0.003 0.369,0.119 0.448,0.296 l 0.88,1.973 c 0.012,0.027 0.021,0.054 0.028,0.083 0.064,0.257 0.018,0.52 -0.13,0.741 -0.173,0.258 -0.479,0.441 -0.817,0.489 l -0.767,0.18 C 0.076,-0.004 0.038,0 0,0"/></g><g transform="translate(16.375,12.8125)" id="g84"><path id="path86" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.809,0.187 c -0.368,0 -0.638,-0.346 -0.549,-0.703 l 1.012,-2.072 0.879,1.973 C 0.614,-0.294 0.322,-0.046 0,0"/></g><g transform="translate(20.3946,13.5)" id="g88"><path id="path90" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.038,0 -0.076,-0.004 -0.113,-0.013 L -0.922,-0.2 c -0.296,-0.041 -0.602,-0.224 -0.775,-0.482 -0.148,-0.221 -0.195,-0.484 -0.13,-0.741 0.007,-0.029 0.016,-0.056 0.028,-0.083 l 0.88,-1.973 c 0.079,-0.177 0.253,-0.293 0.448,-0.296 0.003,0 0.006,0 0.008,0 0.191,0 0.366,0.108 0.45,0.28 l 1.012,2.072 c 0.015,0.032 0.027,0.064 0.035,0.098 0.08,0.321 0.01,0.654 -0.194,0.915 C 0.637,-0.149 0.331,0 0,0"/></g><g transform="translate(19.586,12.8125)" id="g92"><path id="path94" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.809,0.187 c 0.368,0 0.638,-0.346 0.549,-0.703 L 0.346,-2.588 -0.533,-0.615 C -0.614,-0.294 -0.322,-0.046 0,0"/></g><g transform="translate(24,4.9009)" id="g96"><path id="path98" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,-2 C 0,-2.796 -0.748,-3.38 -1.521,-3.187 L -6,-1 -1.365,1.066 C -0.672,1.239 0,0.715 0,0"/></g><g transform="translate(17,5)" id="g100"><path id="path102" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 2,0 c 0.55,0 1,-0.45 1,-1 l 0,0 C 3,-1.55 2.55,-2 2,-2 l -2,0 c -0.55,0 -1,0.45 -1,1 l 0,0 c 0,0.55 0.45,1 1,1"/></g><g transform="translate(15.5171,2.6748)" id="g104"><path id="path106" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.025,0.049 -0.607,1.195 -0.144,2.373 L 0.787,2.006 C 0.493,1.259 0.884,0.469 0.888,0.461 L 0,0 Z"/></g><g transform="translate(20.5215,2.6748)" id="g108"><path id="path110" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.889,0.461 c 0.003,0.005 0.396,0.798 0.102,1.545 l 0.93,0.367 C 0.606,1.195 0.024,0.049 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M32 36v-2c0-3.313-2.687-6-6-6H10c-3.313 0-6 2.687-6 6v2h28z"/><path fill="#BE1931" d="M18 12C4 12 3 17 3 17c0 4 7 7 7 11 2 3 8 4 8 4s6-1 8-4c0-4 7-7 7-11 0 0-3.667-5-15-5z"/><path fill="#E1E8ED" d="M22.635 30.033l-2.905 1.295c-.184-.199-.44-.328-.73-.328h-2c-.29 0-.546.129-.73.328l-2.905-1.295c-.693-.173-1.365.351-1.365 1.066v2c0 .796.748 1.38 1.521 1.187l2.967-1.449c.152.094.321.163.512.163h2c.191 0 .36-.069.512-.163l2.967 1.449c.773.193 1.521-.391 1.521-1.187v-2c0-.715-.672-1.239-1.365-1.066z"/><path fill="#99AAB5" d="M15.517 33.325c-.025-.049-.607-1.195-.144-2.373l.931.367c-.294.747.097 1.537.101 1.545l-.888.461zm5.004 0l-.889-.461c.003-.005.396-.798.102-1.545l.93-.367c.464 1.178-.118 2.324-.143 2.373z"/><path fill="#F3D2A2" d="M13.64 28.101c1.744 1.267 2.848 1.962 4.36 1.962 1.511 0 2.616-.696 4.36-1.962V24.29h-8.72v3.811z"/><path fill="#E2C196" d="M13.632 25.973c1.216 1.374 2.724 1.746 4.364 1.746 1.639 0 3.147-.372 4.364-1.746v-3.491h-8.728v3.491z"/><path fill="#F3D2A2" d="M9.478 16.96c0-5.589 3.816-10.121 8.522-10.121s8.522 4.531 8.522 10.121c0 5.589-3.816 10.12-8.522 10.12s-8.522-4.531-8.522-10.12z"/><path fill="#C1694F" d="M21.755 22.015c-.257-.256-.657-.268-.913-.013-.006.005-.643.49-2.842.49-2.118 0-2.787-.449-2.839-.487-.257-.232-.654-.225-.902.024-.256.256-.256.671 0 .927.036.036.118.186.265.389-.033.156-.031.32.009.481.008.034.02.067.036.098l1.012 2.072c.084.172.258.281.449.281h.009c.194-.003.369-.119.448-.296l.484-1.085c.31.062.647.104 1.029.104.367 0 .694-.037.996-.096l.479 1.075c.079.177.254.293.448.296h.009c.191 0 .365-.109.449-.281l1.012-2.072c.015-.031.027-.064.036-.098.036-.144.032-.29.008-.432.167-.226.265-.4.304-.438.256-.256.27-.683.014-.939z"/><path fill="#F5F8FA" d="M19.586 23.188l.809-.188c.368 0 .639.346.549.703l-1.012 2.072-.88-1.973c-.08-.321.212-.568.534-.614zm-3.211 0L15.566 23c-.368 0-.639.346-.549.703l1.012 2.072.88-1.973c.08-.321-.212-.568-.534-.614z"/><path fill="#DD2E44" d="M14 17c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1zm8 0c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1z"/><path fill="#C1694F" d="M18.75 19.75h-1.5c-.413 0-.75-.337-.75-.75s.337-.75.75-.75h1.5c.413 0 .75.337.75.75s-.337.75-.75.75z"/><path fill="#F3D2A2" d="M26 16l-.47.129s-1.192 3.401 0 3.997C28.194 21.457 29 16.332 29 15c0-1-3 1-3 1zm-16 0l.47.129s1.192 3.401 0 3.997C7.806 21.457 7 16.332 7 15c0-1 3 1 3 1z"/><path fill="#292F33" d="M18 3c-8 0-9 4-9 10s1.757.97 2 0c1-4 5-5 7-1 2-4 6-3 7 1 .243.97 2 6 2 0S26 3 18 3z"/></svg> \ No newline at end of file |