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/1f559.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/1f559.svg')
| -rw-r--r-- | public/emoji/1f559.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f559.svg b/public/emoji/1f559.svg index e341eb5cc..331f702d4 100644 --- a/public/emoji/1f559.svg +++ b/public/emoji/1f559.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(4,18)" id="g24"><path id="path26" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-7.731 6.268,-14 14,-14 7.732,0 14,6.269 14,14 C 28,7.732 21.732,14 14,14 6.268,14 0,7.732 0,0"/></g><g transform="translate(17,18)" id="g28"><path id="path30" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 0.448,-1 1,-1 0.553,0 1,0.447 1,1 L 2,11 C 2,11.552 1.553,12 1,12 0.448,12 0,11.552 0,11 L 0,0 Z"/></g><g transform="translate(9.3389,23)" id="g32"><path id="path34" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.276,-0.479 -0.112,-1.09 0.366,-1.366 l 7.795,-4.5 c 0.478,-0.277 1.089,-0.113 1.365,0.366 0.277,0.478 0.113,1.09 -0.365,1.366 l -7.795,4.5 C 0.888,0.642 0.276,0.478 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="#66757F" d="M17 18c0 .553.448 1 1 1 .553 0 1-.447 1-1V7c0-.552-.447-1-1-1-.552 0-1 .448-1 1v11z"/><path fill="#66757F" d="M9.339 13c-.276.479-.112 1.09.366 1.366l7.795 4.5c.478.276 1.089.112 1.365-.366s.112-1.09-.365-1.366l-7.795-4.5c-.478-.276-1.09-.112-1.366.366z"/></svg> \ No newline at end of file |
