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/27b0.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/27b0.svg')
-rw-r--r-- | public/emoji/27b0.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/27b0.svg b/public/emoji/27b0.svg index f1c056454..8fafa684d 100644 --- a/public/emoji/27b0.svg +++ b/public/emoji/27b0.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(18.0127,25.3291)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4.03,-2.585 -7.513,-6.345 -7.513,-10.642 0,-6.055 4.6,-8.312 7.5,-8.312 2.9,0 7.5,2.273 7.5,8.375 C 7.487,-6.31 4.02,-2.574 0,0 m -0.013,-21.954 c -5.09,0 -10.5,3.965 -10.5,11.312 0,4.877 3.366,9.178 7.591,12.273 -2.698,1.301 -5.334,2.04 -7.091,2.04 -2.708,0 -5.499,-0.914 -5.527,-0.923 -0.789,-0.259 -1.635,0.165 -1.896,0.95 -0.261,0.786 0.164,1.634 0.949,1.896 0.132,0.044 3.268,1.077 6.474,1.077 2.695,0 6.45,-1.158 10.011,-3.162 3.555,2.004 7.3,3.162 9.989,3.162 3.207,0 6.222,-1.559 6.344,-1.625 0.781,-0.422 1.312,-0.699 1.125,-1.266 -0.182,-0.551 -0.891,-0.328 -1.75,-0.234 -0.029,0.003 -2.156,0.391 -5.687,0.391 -1.752,0 -4.411,-1.004 -7.1,-2.304 4.215,-3.083 7.568,-7.36 7.568,-12.212 0,-7.389 -5.41,-11.375 -10.5,-11.375"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M18 32.625c-5.09 0-10.5-3.965-10.5-11.312 0-4.877 3.365-9.178 7.591-12.272C12.393 7.739 9.756 7 8 7c-2.708 0-5.499.914-5.527.923-.79.258-1.635-.165-1.896-.951-.261-.785.163-1.633.949-1.895C1.658 5.033 4.793 4 8 4c2.695 0 6.449 1.158 10.01 3.162C21.565 5.158 25.31 4 28 4c3.207 0 6.222 1.559 6.344 1.625.781.422 1.312.699 1.125 1.266-.182.551-.891.328-1.75.234-.029-.003-2.156-.391-5.688-.391-1.752 0-4.41 1.003-7.1 2.304 4.215 3.083 7.568 7.36 7.568 12.212C28.5 28.639 23.09 32.625 18 32.625zm.013-21.954c-4.03 2.585-7.513 6.345-7.513 10.642 0 6.056 4.6 8.312 7.5 8.312 2.899 0 7.5-2.273 7.5-8.375 0-4.27-3.468-8.005-7.487-10.579z"/></svg> \ No newline at end of file |