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/1f6f6.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/1f6f6.svg')
| -rw-r--r-- | public/emoji/1f6f6.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f6f6.svg b/public/emoji/1f6f6.svg index 9ec5a06c6..b6a216525 100644 --- a/public/emoji/1f6f6.svg +++ b/public/emoji/1f6f6.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(33.7935,19)" id="g20"><path id="path22" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -1.317,-3 -15.794,-3 -14.476,0 -16.026,3 -16.026,3 0,0 -2.974,-5.117 2.828,-8 4.238,-2.105 10.916,0.131 12.723,0.814 C -14.278,-7.869 -6.995,-10.01 -2.712,-8 3.151,-5.249 0,0 0,0"/></g><path id="path24" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 36,12 0,12 0,0 36,0 36,12 Z"/><g transform="translate(27.0052,10.6109)" id="g26"><path id="path28" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.206,0 0.412,0.079 0.57,0.236 0.314,0.315 0.314,0.824 0,1.139 l -8.861,8.86 c -0.315,0.315 -0.824,0.315 -1.139,0 -0.315,-0.314 -0.315,-0.824 0,-1.139 l 8.861,-8.86 C -0.412,0.079 -0.206,0 0,0"/></g><g transform="translate(29.3158,7.4949)" id="g30"><path id="path32" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.412,0 0.825,0.157 1.139,0.472 0.629,0.629 0.629,1.649 0,2.278 l -2.416,2.416 c -0.629,0.63 -1.65,0.63 -2.278,0 -0.63,-0.629 -0.63,-1.648 0,-2.278 L -1.139,0.472 C -0.825,0.157 -0.412,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#DD2E44" d="M33.793 17S32.476 20 18 20C3.523 20 1.973 17 1.973 17S-1 22.117 4.802 25c4.238 2.105 10.916-.131 12.723-.814 1.991.683 9.274 2.824 13.557.814 5.862-2.751 2.711-8 2.711-8z"/><path fill="#55ACEE" d="M0 24h36v12H0z"/><path fill="#FFAC33" d="M27.005 25.389c.206 0 .412-.079.569-.236.315-.315.315-.824 0-1.139l-8.861-8.86c-.315-.315-.824-.315-1.139 0-.315.315-.315.824 0 1.139l8.861 8.86c.158.157.364.236.57.236z"/><path fill="#FFCC4D" d="M29.316 28.505c.412 0 .825-.157 1.139-.472.629-.629.629-1.649 0-2.278l-2.416-2.416c-.629-.629-1.65-.629-2.278 0-.629.629-.629 1.649 0 2.278l2.416 2.416c.314.315.727.472 1.139.472z"/></svg> \ No newline at end of file |
