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/1f40b.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/1f40b.svg')
-rw-r--r-- | public/emoji/1f40b.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f40b.svg b/public/emoji/1f40b.svg index b6d3c6032..8bf0a5387 100644 --- a/public/emoji/1f40b.svg +++ b/public/emoji/1f40b.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,28.999)" id="g20"><path id="path22" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2,-3 -2,1 -5,-2 -3,2 -3,-3 -6,0 0.899,-2.699 3.419,-4.574 6.1,-4.926 -0.277,-1.789 0.202,-3.946 -2.1,-6.073 -2.008,-1.857 -3.023,-0.312 -8,2.999 -3,1.996 -5,4 -10,3 -5.883,-1.177 -11,-5.999 -11,-7.999 0,-2 3,-13.969 21,-13.969 2,0 5.243,0.664 8,2.969 5.955,4.978 5.882,15.349 4.58,19.456 C -0.64,-5.416 0,-2.393 0,0"/></g><g transform="translate(30.2139,4.1875)" id="g24"><path id="path26" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.149,0.165 0.289,0.338 0.429,0.511 1.879,2.35 2.902,5.348 3.355,8.29 -1.999,-4.996 -3.006,-9.988 -13.998,-9.988 -11,0 -15,13 -20,11 0,-2.001 3,-13.969 21,-13.969 2,0 5.243,0.664 8,2.969 0.319,0.265 0.612,0.553 0.9,0.848 C -0.208,-0.228 -0.103,-0.115 0,0"/></g><g transform="translate(8,14.5)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.828 -0.671,-1.5 -1.5,-1.5 -2.329,-1.5 -3,-0.828 -3,0 -3,0.828 -2.329,1.5 -1.5,1.5 -0.671,1.5 0,0.828 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#3B88C3" d="M36 7.001c-2 3-2-1-5 2-3-2-3 3-6 0 .899 2.699 3.419 4.574 6.1 4.926-.277 1.789.202 3.946-2.1 6.073-2.008 1.857-3.023.312-8-2.999-3-1.996-5-4-10-3C5.117 15.178 0 20 0 22s3 13.969 21 13.969c2 0 5.243-.664 8-2.969 5.955-4.978 5.882-15.349 4.58-19.456C35.36 12.417 36 9.394 36 7.001z"/><path fill="#55ACEE" d="M30.214 31.812c.149-.165.289-.338.429-.511 1.879-2.351 2.902-5.349 3.355-8.29C31.999 28.008 30.992 33 20 33 9 33 5 20 0 22c0 2 3 13.969 21 13.969 2 0 5.243-.664 8-2.969.318-.266.612-.554.899-.849.107-.111.212-.223.315-.339z"/><circle fill="#292F33" cx="6.5" cy="21.5" r="1.5"/></svg> \ No newline at end of file |