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/1f370.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/1f370.svg')
-rw-r--r-- | public/emoji/1f370.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f370.svg b/public/emoji/1f370.svg index 7156f048d..c6f2cf478 100644 --- a/public/emoji/1f370.svg +++ b/public/emoji/1f370.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,11)" id="g20"><path id="path22" style="fill:#939598;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-5.523 -8.059,-10 -18,-10 -9.941,0 -18,4.477 -18,10 0,5.523 8.059,10 18,10 C -8.059,10 0,5.523 0,0"/></g><g transform="translate(36,13)" id="g24"><path id="path26" style="fill:#f1f2f2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-5.523 -8.059,-10 -18,-10 -9.941,0 -18,4.477 -18,10 0,5.523 8.059,10 18,10 C -8.059,10 0,5.523 0,0"/></g><g transform="translate(32.7998,13.3887)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.202 -6.626,-7.611 -14.8,-7.611 -8.174,0 -14.8,3.409 -14.8,7.611 0,4.203 6.626,7.611 14.8,7.611 C -6.626,7.611 0,4.203 0,0"/></g><g transform="translate(8,8)" id="g32"><path id="path34" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,3.044 0.417,7.208 0.042,13.875 0.6,1.376 6.146,2.472 6.625,3.792 C 7.954,21.213 5.458,23.583 8,26 c 2.05,1.949 5,2 6,-1 2,2 6,1 6,-2 4,1 6,-3 3,-6 C 23,16 22,8 22,6 22,4 21.792,4.208 16.792,3.208 11.792,2.208 0,0 0,0"/></g><g transform="translate(8,9)" id="g36"><path id="path38" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,12 c 0,0 21,7 21,2.458 L 21,4 0,0 Z"/></g><g transform="translate(8,10)" id="g40"><path id="path42" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,10 c 0,0 12.375,4.208 20,4 L 20,4 0,0 Z"/></g><g transform="translate(8,15)" id="g44"><path id="path46" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,1 21,5 21,4 0,0 Z"/></g><g transform="translate(8,22)" id="g48"><path id="path50" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 9,9 C 11,9 17,8 20,4 10.128,2.025 10.128,2.025 0,0"/></g><g transform="translate(30,26)" id="g52"><path id="path54" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1,1 1,5 -3,4 0,1 -2,4 -5,2 0,1 -5,2 -6,0 C -4,3 0,0 0,0"/></g><g transform="translate(17.9585,25.5415)" id="g56"><path id="path58" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.833,0.208 -4.417,1.083 -3.917,3.5 0.5,2.417 2.474,4.881 3.75,5.542 C 0.959,9.625 2.159,9.199 3.042,5.792 3.625,3.542 5.792,0.667 1.375,0.042 0.917,0.042 0,0 0,0"/></g><g transform="translate(18.3755,30.9585)" id="g60"><path id="path62" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.152,0 -0.302,0.069 -0.4,0.2 l -0.5,0.667 c -0.166,0.22 -0.121,0.534 0.099,0.699 0.221,0.167 0.534,0.122 0.7,-0.1 L 0.399,0.8 C 0.565,0.579 0.52,0.266 0.3,0.1 0.21,0.033 0.104,0 0,0"/></g><g transform="translate(15.959,27.4585)" id="g64"><path id="path66" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.042,0 -0.085,0.005 -0.127,0.016 -0.267,0.07 -0.427,0.343 -0.357,0.61 l 0.25,0.958 C -0.165,1.852 0.11,2.011 0.376,1.942 0.643,1.872 0.803,1.599 0.733,1.332 L 0.483,0.374 C 0.425,0.149 0.222,0 0,0"/></g><g transform="translate(20.333,27.375)" id="g68"><path id="path70" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.089,0 -0.18,0.023 -0.261,0.073 l -0.75,0.458 c -0.235,0.144 -0.309,0.452 -0.166,0.688 0.146,0.236 0.453,0.309 0.688,0.166 L 0.261,0.927 C 0.496,0.783 0.57,0.475 0.427,0.239 0.332,0.085 0.168,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><ellipse fill="#939598" cx="18" cy="25" rx="18" ry="10"/><ellipse fill="#F1F2F2" cx="18" cy="23" rx="18" ry="10"/><ellipse fill="#FFF" cx="18" cy="22.611" rx="14.8" ry="7.611"/><path fill="#E1E8ED" d="M8 28c0-3.044.417-7.208.042-13.875.601-1.377 6.146-2.472 6.625-3.792C15.954 6.787 13.458 4.417 16 2c2.05-1.949 5-2 6 1 2-2 6-1 6 2 4-1 6 3 3 6 0 1-1 9-1 11s-.208 1.792-5.208 2.792S8 28 8 28z"/><path fill="#FFAC33" d="M8 27V15s21-7 21-2.458V23L8 27z"/><path fill="#FFD983" d="M8 26V16s12.375-4.208 20-4v10L8 26z"/><path fill="#FFAC33" d="M8 21v-1l21-4v1z"/><path fill="#E1E8ED" d="M8 14l9-9c2 0 8 1 11 5L8 14z"/><path fill="#FFF" d="M30 10c1-1 1-5-3-4 0-1-2-4-5-2 0-1-5-2-6 0 10 3 14 6 14 6z"/><path fill="#DD2E44" d="M17.958 10.458c-1.833-.208-4.417-1.083-3.917-3.5s2.474-4.881 3.75-5.542C18.917.833 20.117 1.26 21 4.667c.583 2.25 2.75 5.125-1.667 5.75-.458 0-1.375.041-1.375.041z"/><path fill="#F4ABBA" d="M18.375 5.042c-.152 0-.302-.069-.4-.2l-.5-.667c-.166-.221-.121-.534.1-.7.221-.167.534-.122.7.1l.5.667c.166.221.121.534-.1.7-.09.067-.195.1-.3.1zm-2.416 3.5c-.042 0-.084-.005-.127-.016-.267-.07-.427-.343-.357-.61l.25-.958c.069-.267.344-.426.61-.357.267.07.427.343.357.61l-.25.958c-.058.224-.261.373-.483.373zm4.374.083c-.089 0-.18-.023-.261-.073l-.75-.458c-.235-.144-.31-.452-.166-.688.146-.236.453-.31.688-.166l.75.458c.235.144.309.452.166.688-.095.154-.259.239-.427.239z"/></svg> \ No newline at end of file |