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/1f9d9-1f3fd-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/1f9d9-1f3fd-200d-2640-fe0f.svg')
-rw-r--r-- | public/emoji/1f9d9-1f3fd-200d-2640-fe0f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f9d9-1f3fd-200d-2640-fe0f.svg b/public/emoji/1f9d9-1f3fd-200d-2640-fe0f.svg index 0899b523c..bac7c44b6 100644 --- a/public/emoji/1f9d9-1f3fd-200d-2640-fe0f.svg +++ b/public/emoji/1f9d9-1f3fd-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(33,16.9756)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.949 -6.716,-3.529 -15,-3.529 -8.284,0 -15,1.58 -15,3.529 0,1.949 6.716,3.529 15,3.529 8.284,0 15,-1.58 15,-3.529"/></g><g transform="translate(8.2262,20)" id="g24"><path id="path26" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.135,-1 -0.22,-1.83 -0.22,-2.79 0,-2.738 -0.214,-11.027 1.875,-11.027 1.927,0 4.374,2.013 8.123,2.013 3.747,0 6.247,-2.072 8.121,-2.072 1.875,0 1.875,2.2 1.875,11.096 0,0.96 -0.086,1.78 -0.22,2.78 L 0,0 Z"/></g><g transform="translate(26.2755,7.724)" id="g28"><path id="path30" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -16,0 c -2.486,0 -4.774,-1.443 -5.762,-3.449 -0.367,0.415 -0.907,0.619 -1.514,0.619 -1.099,0 -2,-0.935 -2,-1.997 l 0,-2.897 31,0 0,1.931 C 5.724,-2.594 3.313,0 0,0"/></g><g transform="translate(14,11)" id="g32"><path id="path34" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-3.234 c 0,-0.004 0.011,-0.008 0.015,-0.012 0.132,-0.237 3.737,-6.739 3.99,-6.739 0.252,0 3.854,6.502 3.985,6.739 C 7.994,-3.242 8,-3.238 8,-3.234 L 8,0 0,0 Z"/></g><g transform="translate(14.0063,8.4009)" id="g36"><path id="path38" style="fill:#cc9b7a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.115,-1.155 2.497,-1.468 3.999,-1.468 5.502,-1.468 6.885,-1.155 8,0 l 0,2.937 -8,0 L 0,0 Z"/></g><g transform="translate(25.3613,20.1481)" id="g40"><path id="path42" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.02,0 -0.039,-0.008 -0.06,-0.01 -0.771,4.678 -3.742,8.168 -7.297,8.168 -3.557,0 -6.529,-3.49 -7.301,-8.168 C -14.68,-0.009 -14.7,0 -14.723,0 c -0.904,0 -1.638,-1.175 -1.638,-2.623 0,-1.448 0.734,-2.622 1.638,-2.622 0.05,0 0.098,0.016 0.146,0.024 0.882,-4.389 3.776,-7.469 7.22,-7.469 3.441,0 6.335,3.08 7.217,7.468 0.047,-0.007 0.092,-0.023 0.14,-0.023 0.905,0 1.639,1.174 1.639,2.622 C 1.639,-1.175 0.905,0 0,0"/></g><g transform="translate(18.0041,9.4742)" id="g44"><path id="path46" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.606,0 -2.447,0.794 -2.537,0.885 -0.268,0.266 -0.268,0.7 0,0.967 0.266,0.264 0.692,0.266 0.961,0.006 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.571 2.799,1.148 2.535,0.885 2.445,0.794 1.605,0 0,0"/></g><g transform="translate(18.8947,12.5)" id="g48"><path id="path50" 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.423 l 0,0.153 C -2.113,0.81 -1.924,1 -1.69,1 L 0,1 C 0.233,1 0.424,0.81 0.424,0.576 l 0,-0.153 C 0.424,0.189 0.233,0 0,0"/></g><g transform="translate(14.6672,14.6157)" 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.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(21.4319,14.6157)" id="g56"><path id="path58" 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(19,21)" id="g60"><path id="path62" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 4,-4 8,-4 0,0 1,1 0,2 -1,1 -8,2 -8,2 m -2,0 c 0,0 -4,-4 -8,-4 0,0 -1,1 0,2 1,1 8,2 8,2"/></g><g transform="translate(25.7654,20.8431)" id="g64"><path id="path66" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.228,2.686 -6.972,15.157 -7.765,15.157 -0.794,0 -6.538,-12.471 -7.766,-15.157 -4.819,-0.844 -7.234,-2.438 -7.234,-3.843 6,2 11,2.443 15,2.443 4,0 9,-0.443 15,-2.443 C 7.235,-2.438 4.819,-0.844 0,0"/></g><g transform="translate(5,0)" id="g68"><path id="path70" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2,0 -2,24.138 -3,28 1,28 0,24.138 0,0 Z"/></g><g transform="translate(7,30)" id="g72"><path id="path74" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.343,-3 -3,-3 -1.657,0 -3,1.343 -3,3 0,1.657 1.343,3 3,3 1.657,0 3,-1.343 3,-3"/></g><g transform="translate(5,30.5)" id="g76"><path id="path78" style="fill:#b0f0ff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.828 -0.672,-1.5 -1.5,-1.5 -2.328,-1.5 -3,-0.828 -3,0 -3,0.828 -2.328,1.5 -1.5,1.5 -0.672,1.5 0,0.828 0,0"/></g><g transform="translate(7,5.5)" id="g80"><path id="path82" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.933 -1.343,-3.5 -3,-3.5 -1.657,0 -3,1.567 -3,3.5 0,1.933 1.343,2.5 3,2.5 1.657,0 3,-0.567 3,-2.5"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><ellipse fill="#292F33" cx="18" cy="19.024" rx="15" ry="3.529"/><path fill="#D1D3D4" d="M8.226 16c-.135 1-.22 1.83-.22 2.79 0 2.737-.214 11.027 1.875 11.027 1.928 0 4.374-2.013 8.123-2.013 3.748 0 6.247 2.072 8.122 2.072C28 29.876 28 27.676 28 18.78c0-.96-.085-1.78-.22-2.78H8.226z"/><path fill="#9266CC" d="M26.276 28.276h-16c-2.486 0-4.774 1.443-5.762 3.449-.368-.415-.907-.619-1.514-.619-1.1 0-2 .935-2 1.998V36h31v-1.931c0-3.199-2.411-5.793-5.724-5.793z"/><path fill="#D5AB88" d="M14 25v3.234c0 .004.011.007.015.011.132.237 3.737 6.739 3.989 6.739.253 0 3.854-6.502 3.985-6.739.004-.004.01-.007.01-.011V25H14z"/><path fill="#CC9B7A" d="M14.006 27.599c1.115 1.155 2.497 1.468 3.999 1.468 1.503 0 2.886-.312 4.001-1.468v-2.937h-8v2.937z"/><path fill="#D5AB88" d="M25.361 15.852c-.02 0-.039.008-.06.01-.771-4.678-3.743-8.168-7.298-8.168-3.557 0-6.529 3.49-7.3 8.169-.022-.001-.043-.01-.065-.01C9.734 15.852 9 17.027 9 18.475s.734 2.622 1.639 2.622c.05 0 .097-.017.146-.024.881 4.388 3.776 7.469 7.219 7.469 3.442 0 6.335-3.08 7.217-7.468.047.007.092.023.14.023.905 0 1.639-1.174 1.639-2.622s-.733-2.623-1.639-2.623z"/><path fill="#DF1F32" d="M18.004 26.526c-1.606 0-2.447-.794-2.537-.885-.268-.267-.268-.7 0-.967.266-.265.692-.267.961-.007.035.032.551.491 1.576.491 1.038 0 1.555-.473 1.576-.492.273-.256.703-.248.963.02.26.269.26.691-.004.955-.09.091-.929.885-2.535.885"/><path fill="#C1694F" d="M18.895 23.5h-1.69c-.233 0-.423-.19-.423-.423v-.153c0-.233.189-.424.423-.424h1.69c.233 0 .424.19.424.424v.153c0 .233-.191.423-.424.423"/><path fill="#662113" d="M14.667 21.384c-.465 0-.846-.381-.846-.847v-.845c0-.465.381-.846.846-.846.466 0 .847.381.847.846v.845c0 .466-.381.847-.847.847m6.765 0c-.465 0-.846-.381-.846-.847v-.845c0-.465.381-.846.846-.846.465 0 .846.381.846.846v.845c0 .466-.381.847-.846.847"/><path fill="#D1D3D4" d="M17 15s-4 4-8 4c0 0-1-1 0-2s8-2 8-2zm2 0s4 4 8 4c0 0 1-1 0-2s-8-2-8-2z"/><path fill="#9266CC" d="M25.765 15.157C24.537 12.47 18.793 0 18 0s-6.537 12.47-7.765 15.157C5.415 16.001 3 17.595 3 19c6-2 11-2.443 15-2.443S27 17 33 19c0-1.405-2.415-2.999-7.235-3.843z"/><path fill="#D99E82" d="M5 36H3V11.862L2 8h4l-1 3.862z"/><circle fill="#55ACEE" cx="4" cy="6" r="3"/><circle fill="#B0F0FF" cx="3.5" cy="5.5" r="1.5"/><path fill="#D5AB88" d="M7 30.5C7 32.433 5.657 34 4 34s-3-1.567-3-3.5S2.343 28 4 28s3 .567 3 2.5z"/></svg> \ No newline at end of file |