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/1f50b.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/1f50b.svg')
-rw-r--r-- | public/emoji/1f50b.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f50b.svg b/public/emoji/1f50b.svg index d8b375c15..66d420fc3 100644 --- a/public/emoji/1f50b.svg +++ b/public/emoji/1f50b.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(24,32)" id="g20"><path id="path22" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -4,0 c -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 l 4,0 C -1.791,4 0,2.209 0,0"/></g><g transform="translate(30,4)" id="g24"><path id="path26" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -16,0 c -2.209,0 -4,1.791 -4,4 l 0,24 c 0,2.209 1.791,4 4,4 l 16,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><path id="path28" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 30,4 6,4 6,28 30,28 30,4 Z"/><g transform="translate(23,22)" id="g30"><path id="path32" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 0,3 c 0,0.552 -0.447,1 -1,1 L -6,4 C -6.552,4 -7,3.552 -7,3 l 0,-3 -3,0 c -0.553,0 -1,-0.448 -1,-1 l 0,-2 c 0,-0.553 0.447,-1 1,-1 l 3,0 0,-3 c 0,-0.553 0.448,-1 1,-1 l 2,0 c 0.553,0 1,0.447 1,1 l 0,3 3,0 c 0.553,0 1,0.447 1,1 l 0,2 C 1,-0.448 0.553,0 0,0"/></g><g transform="translate(13,6)" id="g34"><path id="path36" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.447 -1,1 l 0,2 c 0,0.553 0.447,1 1,1 l 10,0 c 0.553,0 1,-0.447 1,-1 L 11,1 C 11,0.447 10.553,0 10,0 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M24 4c0 2.209-1.791 4-4 4h-4c-2.209 0-4-1.791-4-4s1.791-4 4-4h4c2.209 0 4 1.791 4 4z"/><path fill="#E1E8ED" d="M30 32c0 2.209-1.791 4-4 4H10c-2.209 0-4-1.791-4-4V8c0-2.209 1.791-4 4-4h16c2.209 0 4 1.791 4 4v24z"/><path fill="#77B255" d="M6 8h24v24H6z"/><path fill="#F5F8FA" d="M23 14h-3v-3c0-.552-.447-1-1-1h-2c-.552 0-1 .448-1 1v3h-3c-.553 0-1 .448-1 1v2c0 .553.447 1 1 1h3v3c0 .553.448 1 1 1h2c.553 0 1-.447 1-1v-3h3c.553 0 1-.447 1-1v-2c0-.552-.447-1-1-1zM13 30c-.553 0-1-.447-1-1v-2c0-.553.447-1 1-1h10c.553 0 1 .447 1 1v2c0 .553-.447 1-1 1H13z"/></svg> \ No newline at end of file |