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/1f526.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/1f526.svg')
-rw-r--r-- | public/emoji/1f526.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f526.svg b/public/emoji/1f526.svg index f934e9d5c..1aff8ae2c 100644 --- a/public/emoji/1f526.svg +++ b/public/emoji/1f526.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(23,19)" id="g20"><path id="path22" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 1,1 c 0,0 1,1 2,0 l 2,-2 c 0,0 1,-1 0,-2 L 4,-4 0,0 Z"/></g><g transform="translate(34.8789,8.1211)" id="g24"><path id="path26" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.166,-1.166 1.166,-3.076 0,-4.242 L -2.758,-7 C -3.924,-8.166 -5.834,-8.166 -7,-7 l -18.758,18.758 c -1.166,1.166 -1.166,3.076 0,4.242 L -23,18.758 c 1.166,1.166 3.076,1.166 4.242,0 L 0,0 Z"/></g><g transform="translate(20.8789,25.1211)" id="g28"><path id="path30" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.166,-1.166 1.166,-3.076 0,-4.242 L -5.758,-10 c -1.166,-1.166 -3.076,-1.166 -4.242,0 l -4.879,4.879 c 0,0 -1,1 0,2 l 8,8 c 1,1 2,0 2,0 L 0,0 Z"/></g><g transform="translate(7,19)" id="g32"><path id="path34" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 10,10 12,8 2,-2 0,0 Z"/></g><g transform="translate(11.001,30)" id="g36"><path id="path38" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.367,0 -0.72,0.202 -0.896,0.553 l -2,4 c -0.247,0.494 -0.046,1.094 0.448,1.342 0.494,0.248 1.094,0.046 1.342,-0.448 l 1.999,-4 C 1.141,0.953 0.94,0.353 0.446,0.105 0.303,0.034 0.15,0 0,0"/></g><g transform="translate(4.999,24)" id="g40"><path id="path42" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.15,0 -0.303,0.034 -0.446,0.105 l -4,2 c -0.494,0.248 -0.695,0.848 -0.448,1.342 0.248,0.494 0.847,0.695 1.342,0.448 l 4,-2 C 0.942,1.648 1.143,1.047 0.896,0.553 0.72,0.202 0.367,0 0,0"/></g><g transform="translate(8,27)" id="g44"><path id="path46" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.256,0 -0.512,0.098 -0.707,0.293 l -4,4 c -0.391,0.391 -0.391,1.023 0,1.414 0.391,0.391 1.023,0.391 1.414,0 l 4,-4 C 1.098,1.316 1.098,0.684 0.707,0.293 0.512,0.098 0.256,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#66757F" d="M23 17l1-1s1-1 2 0l2 2s1 1 0 2l-1 1-4-4z"/><path fill="#8899A6" d="M34.879 27.879c1.166 1.166 1.166 3.076 0 4.242l-2.758 2.758c-1.166 1.166-3.076 1.166-4.242 0L9.121 16.121c-1.167-1.166-1.167-3.076 0-4.242l2.758-2.758c1.167-1.167 3.076-1.167 4.242 0l18.758 18.758z"/><path fill="#66757F" d="M20.879 10.879c1.166 1.167 1.166 3.076 0 4.242l-5.758 5.758c-1.167 1.166-3.076 1.166-4.242 0L6 16s-1-1 0-2l8-8c1-1 2 0 2 0l4.879 4.879z"/><path fill="#8899A6" d="M7 17L17 7l2 2L9 19z"/><path d="M11.001 6c-.367 0-.72-.202-.896-.553l-2-4C7.858.953 8.059.353 8.553.105c.495-.248 1.095-.047 1.342.447l2 4c.247.494.047 1.095-.447 1.342-.144.072-.297.106-.447.106zm-6.002 6c-.15 0-.303-.034-.446-.106l-4-2c-.494-.247-.695-.847-.448-1.341.247-.494.847-.695 1.342-.447l4 2c.494.247.694.848.447 1.342-.175.35-.528.552-.895.552zM8 9c-.256 0-.512-.098-.707-.293l-4-4c-.391-.391-.391-1.023 0-1.414s1.023-.391 1.414 0l4 4c.391.391.391 1.023 0 1.414C8.512 8.902 8.256 9 8 9z" fill="#FFCC4D"/></svg> \ No newline at end of file |