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/1f55a.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/1f55a.svg')
| -rw-r--r-- | public/emoji/1f55a.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f55a.svg b/public/emoji/1f55a.svg index 0f916d26d..58834498d 100644 --- a/public/emoji/1f55a.svg +++ b/public/emoji/1f55a.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(0,18)" id="g20"><path id="path22" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-9.94 8.059,-18 18,-18 9.941,0 18,8.06 18,18 C 36,9.941 27.941,18 18,18 8.059,18 0,9.941 0,0"/></g><g transform="translate(32,18)" id="g24"><path id="path26" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-7.732 -6.268,-14 -14,-14 -7.732,0 -14,6.268 -14,14 0,7.732 6.268,14 14,14 C -6.268,14 0,7.732 0,0"/></g><g transform="translate(18,17)" id="g28"><path id="path30" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.447 -1,1 l 0,12 c 0,0.552 0.448,1 1,1 0.553,0 1,-0.448 1,-1 L 1,1 C 1,0.447 0.553,0 0,0"/></g><g transform="translate(18.001,17)" id="g32"><path id="path34" style="fill:#67757f;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 -4,8 c -0.247,0.494 -0.046,1.095 0.448,1.342 0.495,0.248 1.095,0.046 1.341,-0.448 l 4,-8 C 1.141,0.953 0.94,0.353 0.446,0.105 0.303,0.034 0.15,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><circle fill="#99AAB5" cx="18" cy="18" r="18"/><circle fill="#E1E8ED" cx="18" cy="18" r="14"/><path fill="#67757F" d="M18 19c-.552 0-1-.447-1-1V6c0-.552.448-1 1-1 .553 0 1 .448 1 1v12c0 .553-.447 1-1 1z"/><path fill="#67757F" d="M18.001 19c-.367 0-.72-.202-.896-.553l-4-8c-.247-.494-.047-1.095.447-1.342.496-.248 1.095-.046 1.342.447l4 8c.247.494.047 1.095-.447 1.342-.143.072-.296.106-.446.106z"/></svg> \ No newline at end of file |
