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/1f6e2.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/1f6e2.svg')
-rw-r--r-- | public/emoji/1f6e2.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f6e2.svg b/public/emoji/1f6e2.svg index 9405fe36d..b7f9cc61b 100644 --- a/public/emoji/1f6e2.svg +++ b/public/emoji/1f6e2.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="clipPath22" clipPathUnits="userSpaceOnUse"><path id="path24" 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"><path id="path12" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 29,2 7,2 7,11 29,11 29,2 Z"/><path id="path14" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 29,13 -22,0 0,9 22,0 0,-9 z"/><path id="path16" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 29,23 7,23 7,33 29,33 29,23 Z"/><g id="g18"><g clip-path="url(#clipPath22)" id="g20"><g transform="translate(30,32.8223)" id="g26"><path id="path28" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.454 -0.368,-0.822 -0.822,-0.822 l -22.356,0 C -23.632,-0.822 -24,-0.454 -24,0 l 0,0.355 c 0,0.455 0.368,0.823 0.822,0.823 l 22.356,0 C -0.368,1.178 0,0.81 0,0.355 L 0,0 Z"/></g><g transform="translate(30,21.8223)" id="g30"><path id="path32" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.454 -0.368,-0.822 -0.822,-0.822 l -22.356,0 C -23.632,-0.822 -24,-0.454 -24,0 l 0,0.355 c 0,0.455 0.368,0.823 0.822,0.823 l 22.356,0 C -0.368,1.178 0,0.81 0,0.355 L 0,0 Z"/></g><g transform="translate(30,11.8223)" id="g34"><path id="path36" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.454 -0.368,-0.822 -0.822,-0.822 l -22.356,0 C -23.632,-0.822 -24,-0.454 -24,0 l 0,0.355 c 0,0.455 0.368,0.823 0.822,0.823 l 22.356,0 C -0.368,1.178 0,0.81 0,0.355 L 0,0 Z"/></g><g transform="translate(30,0.8223)" id="g38"><path id="path40" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.454 -0.368,-0.822 -0.822,-0.822 l -22.356,0 C -23.632,-0.822 -24,-0.454 -24,0 l 0,0.355 c 0,0.455 0.368,0.823 0.822,0.823 l 22.356,0 C -0.368,1.178 0,0.81 0,0.355 L 0,0 Z"/></g><g transform="translate(26,34.8721)" id="g42"><path id="path44" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.481 -0.391,-0.872 -0.872,-0.872 l -2.256,0 C -3.609,-0.872 -4,-0.481 -4,0 l 0,0.256 c 0,0.481 0.391,0.872 0.872,0.872 l 2.256,0 C -0.391,1.128 0,0.737 0,0.256 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#3B88C3" d="M7 25h22v9H7zm0-11h22v9H7zM7 3h22v10H7z"/><path fill="#269" d="M30 3.178c0 .454-.368.822-.822.822H6.822C6.368 4 6 3.632 6 3.178v-.356C6 2.368 6.368 2 6.822 2h22.355c.455 0 .823.368.823.822v.356zm0 11c0 .454-.368.822-.822.822H6.822C6.368 15 6 14.632 6 14.178v-.355c0-.455.368-.823.822-.823h22.355c.455 0 .823.368.823.822v.356zm0 10c0 .454-.368.822-.822.822H6.822C6.368 25 6 24.632 6 24.178v-.355c0-.455.368-.823.822-.823h22.355c.455 0 .823.368.823.822v.356zm0 11c0 .454-.368.822-.822.822H6.822C6.368 36 6 35.632 6 35.178v-.355c0-.455.368-.823.822-.823h22.355c.455 0 .823.368.823.822v.356z"/><path fill="#99AAB5" d="M26 1.128c0 .481-.391.872-.872.872h-2.256C22.391 2 22 1.609 22 1.128V.872c0-.481.391-.872.872-.872h2.256c.481 0 .872.391.872.872v.256z"/></svg> \ No newline at end of file |