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/1f5c4.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/1f5c4.svg')
-rw-r--r-- | public/emoji/1f5c4.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f5c4.svg b/public/emoji/1f5c4.svg index d3986817f..4c065fb4b 100644 --- a/public/emoji/1f5c4.svg +++ b/public/emoji/1f5c4.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(30,2)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.895,-2 -2,-2 l -20,0 c -1.104,0 -2,0.895 -2,2 l 0,32 c 0,1.104 0.896,2 2,2 l 20,0 c 1.105,0 2,-0.896 2,-2 L 0,0 Z"/></g><g transform="translate(28,20)" id="g24"><path id="path26" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 l -18,0 c -0.552,0 -1,0.448 -1,1 l 0,13 c 0,0.552 0.448,1 1,1 l 18,0 c 0.553,0 1,-0.448 1,-1 L 0,0 Z"/></g><g transform="translate(28,3)" 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.447,-1 -1,-1 l -18,0 c -0.552,0 -1,0.447 -1,1 l 0,13 c 0,0.553 0.448,1 1,1 l 18,0 c 0.553,0 1,-0.447 1,-1 L 0,0 Z"/></g><g transform="translate(22,28)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 l -6,0 c -0.552,0 -1,0.448 -1,1 l 0,3 c 0,0.552 0.448,1 1,1 l 6,0 C -0.447,4 0,3.552 0,3 L 0,0 Z"/></g><g transform="translate(22,11)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -6,0 c -0.552,0 -1,0.447 -1,1 l 0,3 c 0,0.553 0.448,1 1,1 l 6,0 C -0.447,4 0,3.553 0,3 L 0,0 Z"/></g><path id="path40" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 21,28 -6,0 0,3 6,0 0,-3 z"/><path id="path42" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 21,11 -6,0 0,3 6,0 0,-3 z"/><g transform="translate(24,22.9702)" id="g44"><path id="path46" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.536 -0.435,-0.97 -0.97,-0.97 l -10.06,0 C -11.566,-0.97 -12,-0.536 -12,0 l 0,0.06 c 0,0.535 0.434,0.97 0.97,0.97 l 10.06,0 C -0.435,1.03 0,0.595 0,0.06 L 0,0 Z"/></g><g transform="translate(24,5.9707)" id="g48"><path id="path50" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.536 -0.435,-0.971 -0.97,-0.971 l -10.06,0 C -11.566,-0.971 -12,-0.536 -12,0 l 0,0.059 c 0,0.536 0.434,0.97 0.97,0.97 l 10.06,0 C -0.435,1.029 0,0.595 0,0.059 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M30 34c0 1.104-.896 2-2 2H8c-1.104 0-2-.896-2-2V2c0-1.104.896-2 2-2h20c1.104 0 2 .896 2 2v32z"/><path fill="#66757F" d="M28 16c0 .552-.447 1-1 1H9c-.552 0-1-.448-1-1V3c0-.552.448-1 1-1h18c.553 0 1 .448 1 1v13zm0 17c0 .553-.447 1-1 1H9c-.552 0-1-.447-1-1V20c0-.553.448-1 1-1h18c.553 0 1 .447 1 1v13z"/><path fill="#292F33" d="M22 8c0 .552-.447 1-1 1h-6c-.552 0-1-.448-1-1V5c0-.552.448-1 1-1h6c.553 0 1 .448 1 1v3zm0 17c0 .553-.447 1-1 1h-6c-.552 0-1-.447-1-1v-3c0-.553.448-1 1-1h6c.553 0 1 .447 1 1v3z"/><path fill="#E1E8ED" d="M15 5h6v3h-6zm0 17h6v3h-6zm9-8.97c0 .536-.435.97-.97.97H12.97c-.536 0-.97-.435-.97-.97v-.06c0-.536.434-.97.97-.97h10.06c.535 0 .97.435.97.97v.06zm0 16.999c0 .536-.435.971-.97.971H12.97c-.536 0-.97-.435-.97-.971v-.059c0-.535.434-.97.97-.97h10.06c.535 0 .97.435.97.971v.058z"/></svg> \ No newline at end of file |