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/1f4a8.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/1f4a8.svg')
-rw-r--r-- | public/emoji/1f4a8.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f4a8.svg b/public/emoji/1f4a8.svg index 13a086ec5..006e04ad4 100644 --- a/public/emoji/1f4a8.svg +++ b/public/emoji/1f4a8.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,21)" id="g20"><path id="path22" style="fill:#bdddf4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,4.155 -3.169,7.568 -7.221,7.96 -8.116,11.987 -11.703,15 -16,15 c -4.971,0 -9,-3.561 -9,-8.531 0,-1.157 0.25,-2.906 1.121,-3.785 C -27.141,2.501 -31.906,2.4 -36,2.985 c 0,0 4.816,-3.83 15.357,-3.985 -0.151,-0.313 -0.253,-1.43 -0.306,-1.786 -0.248,-0.003 -0.595,-0.009 -1.051,-0.009 -8,0 -14,0.795 -14,0.795 0,0 3,-3.234 15.406,-4.106 C -21,-6.234 -21,-8 -21,-8 c -8,0 -15,1 -15,1 3.362,-2.802 6.724,-4.033 9.03,-4.574 -0.011,-0.142 -0.03,-0.281 -0.03,-0.426 0,-3.313 2.686,-5 6,-5 0.487,0 0.958,0.064 1.412,0.174 1.597,-2.507 4.395,-4.174 7.588,-4.174 4.971,0 9,4.029 9,9 0,1.788 -0.527,3.449 -1.427,4.851 C -1.805,-5.837 0,-3.132 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#BDDDF4" d="M36 15c0-4.155-3.169-7.568-7.221-7.96C27.884 3.013 24.297 0 20 0c-4.971 0-9 3.56-9 8.531 0 1.156.25 2.906 1.121 3.785C8.859 12.5 4.094 12.6 0 12.015c0 0 4.816 3.831 15.357 3.985-.151.313-.254 1.43-.306 1.786-.249.003-.595.009-1.051.009C6 17.795 0 17 0 17s3 3.234 15.406 4.106C15 21.234 15 23 15 23c-8 0-15-1-15-1 3.362 2.802 6.724 4.033 9.03 4.574-.011.142-.03.281-.03.426 0 3.313 2.686 5 6 5 .487 0 .958-.064 1.412-.174C18.009 34.333 20.807 36 24 36c4.971 0 9-4.029 9-9 0-1.788-.527-3.449-1.427-4.851C34.195 20.837 36 18.132 36 15z"/></svg> \ No newline at end of file |