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/1f446-1f3ff.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/1f446-1f3ff.svg')
-rw-r--r-- | public/emoji/1f446-1f3ff.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f446-1f3ff.svg b/public/emoji/1f446-1f3ff.svg index 21289fae2..56492307a 100644 --- a/public/emoji/1f446-1f3ff.svg +++ b/public/emoji/1f446-1f3ff.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(30,15.8555)" id="g20"><path id="path22" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0.094,2.362 -1.791,3.068 -3.458,3.693 -4.1,2.446 -4.1,2.446 c 0,0 0.059,1.914 -1.941,2.622 -1.885,0.668 -2.75,-0.958 -2.75,-0.958 0,0 -0.307,1.871 -2.292,2.417 C -12.754,6.986 -14,5.36 -14,5.36 l 0,12.208 c 0,0.959 -0.542,2.575 -2.542,2.577 -2,0.001 -2.458,-1.66 -2.458,-2.577 l 0,-16.5 0,-4 c 0,-1 -1,-1 -1,0 l 0,2.666 c 0,3.792 -2.037,6.142 -2.75,6.792 -0.713,0.65 -1.667,0.98 -2.82,0.735 -1.956,-0.416 -1.529,-1.92 -0.974,-3.198 1.336,-3.078 2.253,-7.463 2.532,-9.538 0.791,-5.857 5.809,-10.375 11.884,-10.38 6.626,-0.004 12.123,5.297 12.128,11.923 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#7C533E" d="M30 20.145s.094-2.362-1.791-3.068c-1.667-.625-2.309.622-2.309.622s.059-1.913-1.941-2.622c-1.885-.667-2.75.959-2.75.959s-.307-1.872-2.292-2.417C17.246 13.159 16 14.785 16 14.785V2.576C16 1.618 15.458.001 13.458 0S11 1.66 11 2.576v20.5c0 1-1 1-1 0V20.41c0-3.792-2.037-6.142-2.75-6.792-.713-.65-1.667-.98-2.82-.734-1.956.416-1.529 1.92-.974 3.197 1.336 3.078 2.253 7.464 2.533 9.538.79 5.858 5.808 10.375 11.883 10.381 6.626.004 12.123-5.298 12.128-11.924v-3.931z"/></svg> \ No newline at end of file |