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/1f31d.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/1f31d.svg')
-rw-r--r-- | public/emoji/1f31d.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f31d.svg b/public/emoji/1f31d.svg index cc75e8a56..7204904b5 100644 --- a/public/emoji/1f31d.svg +++ b/public/emoji/1f31d.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(36,18)" id="g20"><path id="path22" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-9.941 -8.059,-18 -18,-18 -9.941,0 -18,8.059 -18,18 0,9.941 8.059,18 18,18 C -8.059,18 0,9.941 0,0"/></g><g transform="translate(13,28.5)" id="g24"><path id="path26" style="fill:#b8c5cd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.933 -1.566,-3.5 -3.5,-3.5 -5.434,-3.5 -7,-1.933 -7,0 -7,1.933 -5.434,3.5 -3.5,3.5 -1.566,3.5 0,1.933 0,0"/></g><g transform="translate(28,7.5)" id="g28"><path id="path30" style="fill:#b8c5cd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.934 -1.566,-3.5 -3.5,-3.5 -5.434,-3.5 -7,-1.934 -7,0 -7,1.934 -5.434,3.5 -3.5,3.5 -1.566,3.5 0,1.934 0,0"/></g><g transform="translate(24,31)" id="g32"><path id="path34" style="fill:#b8c5cd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2"/></g><g transform="translate(2,18)" id="g36"><path id="path38" style="fill:#b8c5cd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.553 0.448,-1 1,-1 1.552,-1 2,-0.553 2,0 2,0.552 1.552,1 1,1 0.448,1 0,0.552 0,0"/></g><g transform="translate(29,27)" id="g40"><path id="path42" style="fill:#b8c5cd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.553 0.447,-1 1,-1 1.553,-1 2,-0.553 2,0 2,0.552 1.553,1 1,1 0.447,1 0,0.552 0,0"/></g><g transform="translate(15,5)" id="g44"><path id="path46" style="fill:#b8c5cd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.553 0.447,-1 1,-1 1.553,-1 2,-0.553 2,0 2,0.553 1.553,1 1,1 0.447,1 0,0.553 0,0"/></g><g transform="translate(34,17)" id="g48"><path id="path50" style="fill:#b8c5cd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2"/></g><g transform="translate(8,10)" id="g52"><path id="path54" style="fill:#b8c5cd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.896,-2 -2,-2 -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 1.104,0 2,-0.895 2,-2"/></g><g transform="translate(18,11.0957)" id="g56"><path id="path58" style="fill:#4f585d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -7,0 -9,2.618 -9,1.381 0,-1.238 4,-4.477 9,-4.477 5,0 9,3.239 9,4.477 C 9,2.618 7,0 0,0"/></g><g transform="translate(27,21)" id="g60"><path id="path62" style="fill:#4f585d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.344,-3 -3,-3 -1.656,0 -3,1.343 -3,3 0,1.657 1.344,3 3,3 1.656,0 3,-1.343 3,-3"/></g><g transform="translate(15,21)" id="g64"><path id="path66" style="fill:#4f585d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.344,-3 -3,-3 -1.656,0 -3,1.343 -3,3 0,1.657 1.344,3 3,3 1.656,0 3,-1.343 3,-3"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M36 18c0 9.941-8.059 18-18 18S0 27.941 0 18 8.059 0 18 0s18 8.059 18 18"/><g fill="#B8C5CD"><circle cx="9.5" cy="7.5" r="3.5"/><circle cx="24.5" cy="28.5" r="3.5"/><circle cx="22" cy="5" r="2"/><circle cx="3" cy="18" r="1"/><circle cx="30" cy="9" r="1"/><circle cx="16" cy="31" r="1"/><circle cx="32" cy="19" r="2"/><circle cx="6" cy="26" r="2"/></g><path d="M18 24.904c-7 0-9-2.618-9-1.381C9 24.762 13 28 18 28s9-3.238 9-4.477c0-1.237-2 1.381-9 1.381M27 15c0 1.657-1.344 3-3 3s-3-1.343-3-3 1.344-3 3-3 3 1.343 3 3m-12 0c0 1.657-1.344 3-3 3s-3-1.343-3-3 1.344-3 3-3 3 1.343 3 3" fill="#4F585D"/></svg> \ No newline at end of file |