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/1f9dd-1f3fb-200d-2640-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/1f9dd-1f3fb-200d-2640-fe0f.svg')
-rw-r--r-- | public/emoji/1f9dd-1f3fb-200d-2640-fe0f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f9dd-1f3fb-200d-2640-fe0f.svg b/public/emoji/1f9dd-1f3fb-200d-2640-fe0f.svg index 5214ac009..d561e2d69 100644 --- a/public/emoji/1f9dd-1f3fb-200d-2640-fe0f.svg +++ b/public/emoji/1f9dd-1f3fb-200d-2640-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(22,31.5)" id="g20"><path id="path22" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.933 -1.791,-3.5 -4,-3.5 -2.209,0 -4,1.567 -4,3.5 0,1.933 1.791,3.5 4,3.5 2.209,0 4,-1.567 4,-3.5"/></g><g transform="translate(22,30)" id="g24"><path id="path26" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.791,-3 -4,-3 -2.209,0 -4,1.343 -4,3 0,1.657 1.791,3 4,3 2.209,0 4,-1.343 4,-3"/></g><g transform="translate(8,22)" id="g28"><path id="path30" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -1,-14 -1,-19 L 10,-19 10,1 0,0 Z"/></g><g transform="translate(28,22)" id="g32"><path id="path34" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 1,-14 1,-19 l -11,0 0,20 10,-1 z"/></g><g transform="translate(18,24)" id="g36"><path id="path38" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,8 c -5,0 -10,-3 -10,-9 0,-6 2.553,-0.894 3,0 2,4 5,1 7,1"/></g><g transform="translate(18,24)" id="g40"><path id="path42" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,8 C 5,8 10,5 10,-1 10,-7 7.447,-1.894 7,-1 5,3 2,0 0,0"/></g><g transform="translate(32,0)" id="g44"><path id="path46" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,1 c 0,3.314 -3.686,7 -7,7 l -14,0 c -3.313,0 -7,-3.686 -7,-7 l 0,-1 28,0 z"/></g><g transform="translate(13.6397,7.899)" id="g48"><path id="path50" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.744,-1.267 4.36,-6.899 4.36,-6.899 0,0 2.616,5.633 4.36,6.899 l 0,3.811 L 0,3.811 0,0 Z"/></g><g transform="translate(13.6318,10.0272)" id="g52"><path id="path54" style="fill:#eec2ad;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.216,-1.374 2.724,-2.027 4.364,-2.027 1.639,0 3.147,0.654 4.364,2.027 l 0,3.491 L 0,3.491 0,0 Z"/></g><g transform="translate(10,21)" id="g56"><path id="path58" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.589 3.293,8.879 8,8.879 4.707,0 8,-3.29 8,-8.879 0,-8 -5,-12 -8,-12 -3,0 -8,4 -8,12"/></g><g transform="translate(14.5,18.25)" id="g60"><path id="path62" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.467,0 -0.85,0.383 -0.85,0.85 l 0,0.8 c 0,0.468 0.383,0.85 0.85,0.85 l 0,0 c 0.467,0 0.85,-0.382 0.85,-0.85 l 0,-0.8 C 0.85,0.383 0.467,0 0,0"/></g><g transform="translate(21.5,18.25)" id="g64"><path id="path66" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.467,0 -0.85,0.383 -0.85,0.85 l 0,0.8 c 0,0.468 0.383,0.85 0.85,0.85 0.467,0 0.85,-0.382 0.85,-0.85 l 0,-0.8 C 0.85,0.383 0.467,0 0,0"/></g><g transform="translate(18.65,14.8)" id="g68"><path id="path70" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.3,0 c -0.33,0 -0.6,0.27 -0.6,0.6 l 0,0 c 0,0.33 0.27,0.6 0.6,0.6 l 1.3,0 c 0.33,0 0.6,-0.27 0.6,-0.6 l 0,0 C 0.6,0.27 0.33,0 0,0"/></g><g transform="translate(18,11.6611)" id="g72"><path id="path74" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.256,0 -2.353,0.361 -2.933,0.968 -0.23,0.239 -0.221,0.619 0.018,0.848 0.239,0.229 0.619,0.221 0.848,-0.018 C -1.719,1.435 -0.908,1.2 0,1.2 0.907,1.2 1.719,1.435 2.066,1.798 2.295,2.038 2.675,2.047 2.915,1.816 3.154,1.587 3.162,1.207 2.934,0.968 2.353,0.361 1.256,0 0,0"/></g><g transform="translate(8.11,21.9272)" id="g76"><path id="path78" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 1.936,-1.849 c 0,0 0.973,-3.051 0,-3.996 C 1.037,-6.72 -3.11,-0.332 -3.11,1 -3.11,2 0,0 0,0"/></g><g transform="translate(27.5681,21.9272)" id="g80"><path id="path82" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.779,-1.849 c 0,0 -0.602,-2.823 0,-3.996 C -1.331,-6.72 3.432,-0.332 3.432,1 3.432,2 0,0 0,0"/></g><g transform="translate(18,32)" id="g84"><path id="path86" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -5,0 -9,-3 -9,-9 0,-6 1.445,-0.832 2,0 2,3 5,1 7,1 2,0 5,2 7,-1 0.555,-0.832 2,-6 2,0 0,6 -4,9 -9,9"/></g><g transform="translate(9,23)" id="g88"><path id="path90" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,-23 4,0 C 3,-23 0.373,-2.516 2,0 2.698,1.08 0,0 0,0"/></g><g transform="translate(26.9854,23)" id="g92"><path id="path94" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.986,-23 -4,0 c 0,0 2.646,20.484 1.042,23 C -2.66,1.08 0,0 0,0"/></g><g transform="translate(18,29)" id="g96"><path id="path98" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4,0 8,-2 8,-4 0,0 -2,3 -8,3 -6,0 -8,-3 -8,-3 0,0 1,4 8,4"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><ellipse fill="#662113" cx="18" cy="4.5" rx="4" ry="3.5"/><ellipse fill="#EA596E" cx="18" cy="6" rx="4" ry="3"/><path fill="#662113" d="M8 14S7 28 7 33h11V13L8 14zm20 0s1 14 1 19H18V13l10 1z"/><path fill="#662113" d="M18 12V4C13 4 8 7 8 13s2.553.894 3 0c2-4 5-1 7-1zm0 0V4c5 0 10 3 10 9s-2.553.894-3 0c-2-4-5-1-7-1z"/><path fill="#5C913B" d="M32 36v-1c0-3.313-3.687-7-7-7H11c-3.313 0-7 3.687-7 7v1h28z"/><path fill="#F7DECE" d="M13.64 28.101C15.384 29.368 18 35 18 35s2.616-5.633 4.36-6.899V24.29h-8.72v3.811z"/><path fill="#EEC2AD" d="M13.632 25.973C14.848 27.347 16.356 28 17.996 28c1.639 0 3.147-.654 4.364-2.027v-3.491h-8.728v3.491z"/><path fill="#F7DECE" d="M10 15c0-5.589 3.293-8.879 8-8.879s8 3.29 8 8.879c0 8-5 12-8 12s-8-4-8-12z"/><path fill="#662113" d="M14.5 17.75c-.468 0-.85-.382-.85-.85v-.8c0-.467.382-.85.85-.85.467 0 .85.382.85.85v.8c0 .468-.382.85-.85.85zm7 0c-.468 0-.85-.382-.85-.85v-.8c0-.467.382-.85.85-.85.468 0 .85.382.85.85v.8c0 .468-.382.85-.85.85z"/><path fill="#C1694F" d="M18.65 21.2h-1.3c-.33 0-.6-.27-.6-.6 0-.33.27-.6.6-.6h1.3c.33 0 .6.27.6.6 0 .33-.27.6-.6.6z"/><path fill="#DF1F32" d="M18 24.339c-1.256 0-2.353-.361-2.933-.968-.229-.239-.221-.619.018-.849.239-.229.619-.221.848.019.348.363 1.159.598 2.067.598.907 0 1.719-.234 2.066-.598.229-.24.608-.249.849-.019.239.229.247.609.019.849-.581.607-1.678.968-2.934.968z"/><path fill="#F7DECE" d="M8.11 14.073l1.936 1.849s.973 3.051 0 3.997C9.147 20.793 5 14.405 5 13.073c0-1 3.11 1 3.11 1zm19.458 0l-1.779 1.849s-.602 2.823 0 3.997c.448.874 5.211-5.514 5.211-6.846 0-1-3.432 1-3.432 1z"/><path fill="#662113" d="M18 4c-5 0-9 3-9 9s1.445.832 2 0c2-3 5-1 7-1s5-2 7 1c.555.832 2 6 2 0s-4-9-9-9z"/><path fill="#662113" d="M9 13L8 36h4s-2.627-20.484-1-23c.698-1.08-2 0-2 0zm17.985 0l.986 23h-4s2.646-20.484 1.043-23c-.688-1.08 1.971 0 1.971 0z"/><path fill="#EA596E" d="M18 7c4 0 8 2 8 4 0 0-2-3-8-3s-8 3-8 3 1-4 8-4z"/></svg> \ No newline at end of file |