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/1f36f.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/1f36f.svg')
-rw-r--r-- | public/emoji/1f36f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f36f.svg b/public/emoji/1f36f.svg index b29e9bf7f..38c4dd506 100644 --- a/public/emoji/1f36f.svg +++ b/public/emoji/1f36f.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(31,14)" id="g20"><path id="path22" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3,-11 -5.019,-14 -13,-14 -8,0 -10,3 -13,14 -2.035,7.46 2,14 13,14 C -2,14 2.034,7.46 0,0"/></g><g transform="translate(29,25)" id="g24"><path id="path26" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2,-4 -3,-8 -11,-8 -8,0 -13,4 -11,8 1.482,2.964 4.373,6 11,6 6.627,0 9.519,-3.036 11,-6"/></g><g transform="translate(30,25)" id="g28"><path id="path30" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4 -5.373,-6 -12,-6 -6.627,0 -12,2 -12,6 0,3.313 5.373,6 12,6 C -5.373,6 0,3.313 0,0"/></g><g transform="translate(27,26)" id="g32"><path id="path34" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1,-1 2,-2 2,-3 0,-1 -1,-3 -2,-2 0,0 2.948,-1.154 2,-4 -1,-3 -4,-2 -4,0 0,2 -1.553,3.342 -2,2 -1,-3 -3,-3 -4,-2 -1,1 -1,2 -1,2 0,0 -3,0 -2,2 1,2 0,2 0,2 0,0 0,1 1,1 1,0 7,1 8,2 1,1 2,0 2,0"/></g><g transform="translate(28,26.7222)" id="g36"><path id="path38" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.608 -4.477,-4.722 -10,-4.722 -5.523,0 -10,2.114 -10,4.722 0,2.608 4.477,4.278 10,4.278 5.523,0 10,-1.67 10,-4.278"/></g><g transform="translate(18,22)" id="g40"><path id="path42" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 4.548,0 8.379,1.435 9.593,3.396 9.4,3.598 9.201,3.799 9,4 9,4 7,6 6,5 5,4 0,4 -1,4 -2,4 -3,3 -3,3 -3,3 -1.413,0.989 -1.602,0.066 -1.08,0.026 -0.547,0 0,0"/></g><g transform="translate(26,27.5)" id="g44"><path id="path46" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.933 -3.582,-3.5 -8,-3.5 -4.419,0 -8,1.567 -8,3.5 0,1.933 3.581,5.5 8,5.5 4.418,0 8,-3.567 8,-5.5"/></g><g transform="translate(20,33.5)" id="g48"><path id="path50" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.828 -0.895,-1.5 -2,-1.5 -1.104,0 -2,0.672 -2,1.5 0,0.828 0.896,1.5 2,1.5 1.105,0 2,-0.672 2,-1.5"/></g><g transform="translate(5.6851,11.5898)" id="g52"><path id="path54" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.725,-2.457 1.425,-4.436 2.204,-6.013 3.111,-2.577 8.111,-2.577 10.111,-2.577 2,0 7,0 10.106,2.576 0.781,1.577 1.483,3.556 2.208,6.014 C 21.924,-1.562 17.427,-2.59 12.315,-2.59 7.203,-2.59 2.705,-1.562 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F4900C" d="M31 22c-3 11-5.019 14-13 14-8 0-10-3-13-14C2.965 14.54 7 8 18 8s15.034 6.54 13 14z"/><path fill="#BE1931" d="M29 11c2 4-3 8-11 8S5 15 7 11c1.482-2.964 4.373-6 11-6s9.519 3.036 11 6z"/><ellipse fill="#FFAC33" cx="18" cy="11" rx="12" ry="6"/><path fill="#FFE8B6" d="M27 10c1 1 2 2 2 3s-1 3-2 2c0 0 2.948 1.154 2 4-1 3-4 2-4 0s-1.553-3.342-2-2c-1 3-3 3-4 2s-1-2-1-2-3 0-2-2 0-2 0-2 0-1 1-1 7-1 8-2 2 0 2 0z"/><path fill="#662113" d="M28 9.278C28 11.886 23.523 14 18 14S8 11.886 8 9.278C8 6.67 12.477 5 18 5s10 1.67 10 4.278z"/><path fill="#F4900C" d="M18 14c4.548 0 8.379-1.435 9.593-3.396-.193-.202-.392-.403-.593-.604 0 0-2-2-3-1s-6 1-7 1-2 1-2 1 1.587 2.011 1.397 2.934c.523.04 1.056.066 1.603.066z"/><path fill="#FFCC4D" d="M26 8.5c0 1.933-3.582 3.5-8 3.5s-8-1.567-8-3.5S13.582 3 18 3s8 3.567 8 5.5z"/><ellipse fill="#F4900C" cx="18" cy="2.5" rx="2" ry="1.5"/><path fill="#FFCC4D" d="M5.685 24.41c.725 2.457 1.425 4.435 2.204 6.013C11 33 16 33 18 33s7 0 10.106-2.576c.78-1.576 1.483-3.556 2.208-6.014C27.609 25.973 23.112 27 18 27s-9.61-1.027-12.315-2.59z"/></svg> \ No newline at end of file |