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/1f447-1f3fd.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/1f447-1f3fd.svg')
-rw-r--r-- | public/emoji/1f447-1f3fd.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f447-1f3fd.svg b/public/emoji/1f447-1f3fd.svg index e363bcc3c..553f3b906 100644 --- a/public/emoji/1f447-1f3fd.svg +++ b/public/emoji/1f447-1f3fd.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(4.0054,20.1392)" id="g20"><path id="path22" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.099,-2.362 1.784,-3.073 1.666,-0.629 2.31,0.617 2.31,0.617 0,0 -0.063,-1.914 1.936,-2.627 1.883,-0.672 2.752,0.952 2.752,0.952 0,0 0.302,-1.873 2.286,-2.423 1.67,-0.463 2.919,1.16 2.919,1.16 0,0 -0.027,-11.25 -0.029,-12.208 -0.002,-0.959 0.536,-2.576 2.537,-2.582 2,-0.007 2.461,1.653 2.463,2.57 0.001,0.916 0.03,12.5 0.04,16.5 10e-4,0.426 0.008,3.754 0.008,4 0.003,1 1.003,0.998 1,-0.002 -0.002,-1 -0.004,-1.671 -0.005,-2.666 -0.009,-3.793 2.023,-6.148 2.734,-6.799 0.712,-0.652 1.665,-0.983 2.818,-0.741 1.957,0.41 1.534,1.916 0.983,3.194 -1.329,3.082 -2.236,7.47 -2.51,9.545 C 23.249,11.276 18.242,15.806 12.167,15.826 5.541,15.846 0.03,10.558 0.009,3.932 0.008,3.58 0,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#D5AB88" d="M4.005 15.861s-.099 2.362 1.784 3.073c1.666.629 2.31-.617 2.31-.617s-.063 1.914 1.936 2.626c1.883.673 2.752-.951 2.752-.951s.302 1.872 2.286 2.423c1.67.463 2.919-1.16 2.919-1.16l-.029 12.208c-.002.959.537 2.576 2.537 2.582 2 .007 2.461-1.653 2.463-2.57l.04-16.5.009-4c.003-1 1.003-.997 1 .003l-.006 2.666c-.009 3.792 2.023 6.148 2.734 6.798.712.652 1.665.983 2.818.741 1.957-.41 1.534-1.916.982-3.194-1.329-3.082-2.235-7.47-2.51-9.545C27.254 4.584 22.247.055 16.172.035 9.546.015 4.035 5.303 4.015 11.929l-.01 3.932z"/></svg> \ No newline at end of file |