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/1f9de-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/1f9de-200d-2640-fe0f.svg')
-rw-r--r-- | public/emoji/1f9de-200d-2640-fe0f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f9de-200d-2640-fe0f.svg b/public/emoji/1f9de-200d-2640-fe0f.svg index dfcd6d61c..9893e0abc 100644 --- a/public/emoji/1f9de-200d-2640-fe0f.svg +++ b/public/emoji/1f9de-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,32.5)" id="g20"><path id="path22" style="fill:#292f33;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(30,20)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-5.523 -5.373,-10 -12,-10 -6.627,0 -12,4.477 -12,10 0,5.523 5.373,10 12,10 C -5.373,10 0,5.523 0,0"/></g><g transform="translate(21,32)" id="g28"><path id="path30" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -1.343,-2 -3,-2 -1.657,0 -3,0.895 -3,2 0,1.105 1.343,2 3,2 1.657,0 3,-0.895 3,-2"/></g><g transform="translate(31,0)" id="g32"><path id="path34" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,4.5 C 0,7.814 -3.561,10 -6.875,10 l -12,0 C -22.188,10 -26,7.814 -26,4.5 L -26,0 0,0 Z"/></g><g transform="translate(14.5,9.4824)" id="g36"><path id="path38" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.466,-1.065 2.792,-0.98 3.5,-0.98 0.708,0 2.194,-0.085 3.488,0.949 L 7,4.108 0,4.108 0,0 Z"/></g><g transform="translate(14.4825,11.5625)" id="g40"><path id="path42" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.973,-0.937 2.674,-1.118 3.508,-1.118 0.823,0 2.537,0.181 3.51,1.118 l 0,3.286 L 0,3.286 0,0 Z"/></g><g transform="translate(10.7339,21.373)" id="g44"><path id="path46" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.834 3.229,10.564 7.211,10.564 3.981,0 7.209,-4.73 7.209,-10.564 0,-5.833 -3.228,-10.285 -7.209,-10.285 C 3.229,-10.285 0,-5.833 0,0"/></g><g transform="translate(17.9453,13.5479)" id="g48"><path id="path50" 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(14.6084,19.2041)" 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.373,19.2041)" 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(18.8359,16.5908)" id="g60"><path id="path62" style="fill:#55acee;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(18.0517,33)" id="g64"><path id="path66" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 8.056,0 10.948,-6.197 10.948,-12.123 0,-5.926 -2.892,-7.877 -2.892,-7.877 0,0 1,1.951 0,3.902 -1,1.952 -1,5.854 -1,5.854 0,0 -2.879,0.286 -5,0.976 -3,0.975 -4,1.951 -4,1.951 0,0 -3,-2.927 -5,-2.927 0,0 0,-1.951 -1,-4.878 -0.633,-1.851 0,-4.878 0,-4.878 0,0 -3,2.927 -3,8.78 C -10.944,-5.366 -8.056,0 0,0"/></g><g transform="translate(11.805,20.0582)" id="g68"><path id="path70" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.514,-1.282 0.307,-2.57 -0.462,-2.879 -0.769,-0.308 -1.809,0.481 -2.323,1.763 -0.513,1.281 -0.306,2.57 0.462,2.878 C -1.554,2.071 -0.514,1.282 0,0"/></g><g transform="translate(24.195,20.0582)" id="g72"><path id="path74" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.514,-1.282 -0.307,-2.57 0.462,-2.879 1.231,-3.187 2.271,-2.398 2.785,-1.116 3.298,0.165 3.091,1.454 2.323,1.762 1.554,2.071 0.514,1.282 0,0"/></g><g transform="translate(9.0005,0)" id="g76"><path id="path78" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -1,3 1,4 2.828,1.414 7,-3 8,-3 1,0 5.171,4.414 8,3 2,-1 1,-4 1,-4 L 0,0 Z"/></g><g transform="translate(18,7)" id="g80"><path id="path82" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 3,0 4,3 4,3 l 1,0 c 0,0 0,-5 -5,-5 -5,0 -5,5 -5,5 l 1,0 c 0,0 1,-3 4,-3"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><ellipse fill="#292F33" cx="18" cy="3.5" rx="4" ry="3.5"/><ellipse fill="#292F33" cx="18" cy="16" rx="12" ry="10"/><ellipse fill="#FFCC4D" cx="18" cy="4" rx="3" ry="2"/><path fill="#88C9F9" d="M31 36v-4.5c0-3.314-3.56-5.5-6.875-5.5h-12C8.812 26 5 28.186 5 31.5V36h26z"/><path fill="#88C9F9" d="M14.5 26.518c1.466 1.065 2.792.98 3.5.98s2.194.085 3.488-.949l.012-4.14h-7v4.109z"/><path fill="#55ACEE" d="M14.483 24.438c.973.938 2.674 1.118 3.508 1.118.823 0 2.537-.181 3.51-1.118v-3.286h-7.017v3.286z"/><path fill="#88C9F9" d="M10.734 14.627c0-5.834 3.229-10.563 7.211-10.563 3.981 0 7.209 4.73 7.209 10.563s-3.228 10.285-7.209 10.285c-3.983 0-7.211-4.452-7.211-10.285"/><path fill="#DF1F32" d="M17.945 22.452c-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-.089.091-.929.885-2.535.885"/><path fill="#662113" d="M14.608 16.796c-.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="#55ACEE" d="M18.836 19.409h-1.69c-.233 0-.423-.19-.423-.423v-.153c0-.233.189-.424.423-.424h1.69c.233 0 .424.19.424.424v.153c0 .234-.191.423-.424.423"/><path fill="#292F33" d="M18.052 3C26.107 3 29 9.197 29 15.123S26.107 23 26.107 23s1-1.951 0-3.902-1-5.854-1-5.854-2.879-.286-5-.976c-3-.976-4-1.951-4-1.951s-3 2.927-5 2.927c0 0 0 1.951-1 4.878-.632 1.851 0 4.878 0 4.878s-3-2.927-3-8.78S9.996 3 18.052 3z"/><ellipse transform="rotate(-21.844 10.413 16.5)" fill="#88C9F9" cx="10.413" cy="16.5" rx="1.5" ry="2.5"/><ellipse transform="rotate(-68.155 25.587 16.5)" fill="#88C9F9" cx="25.587" cy="16.5" rx="2.5" ry="1.5"/><path fill="#A0041E" d="M9 36s-1-3 1-4c2.828-1.414 7 3 8 3s5.172-4.414 8-3c2 1 1 4 1 4H9z"/><path fill="#FFCC4D" d="M18 29c3 0 4-3 4-3h1s0 5-5 5-5-5-5-5h1s1 3 4 3z"/></svg> \ No newline at end of file |