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/2a-20e3.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/2a-20e3.svg')
| -rw-r--r-- | public/emoji/2a-20e3.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/2a-20e3.svg b/public/emoji/2a-20e3.svg index e3ace7202..d9c53c996 100644 --- a/public/emoji/2a-20e3.svg +++ b/public/emoji/2a-20e3.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(32,36)" id="g20"><path id="path22" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -28,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-28 c 0,-2.209 1.791,-4 4,-4 l 28,0 c 2.209,0 4,1.791 4,4 L 4,-4 C 4,-1.791 2.209,0 0,0"/></g><g transform="translate(19,29)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 c -0.552,0 -1,-0.448 -1,-1 l 0,-20 c 0,-0.553 0.448,-1 1,-1 l 2,0 c 0.553,0 1,0.447 1,1 L 1,-1 C 1,-0.448 0.553,0 0,0"/></g><g transform="translate(26.6173,24.9097)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1.105,-1.667 C 1.41,-2.128 1.284,-2.748 0.824,-3.053 l -16.672,-11.048 c -0.461,-0.305 -1.081,-0.179 -1.386,0.282 l -1.105,1.667 c -0.305,0.461 -0.18,1.08 0.281,1.386 L -1.386,0.281 C -0.926,0.586 -0.305,0.461 0,0"/></g><g transform="translate(9.3828,24.9097)" id="g32"><path id="path34" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.105,-1.667 c -0.305,-0.461 -0.179,-1.081 0.281,-1.386 l 16.672,-11.048 c 0.461,-0.305 1.081,-0.179 1.386,0.282 l 1.105,1.667 c 0.305,0.461 0.18,1.08 -0.281,1.386 L 1.386,0.281 C 0.926,0.586 0.305,0.461 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#3B88C3" d="M32 0H4C1.791 0 0 1.791 0 4v28c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4V4c0-2.209-1.791-4-4-4z"/><path fill="#FFF" d="M19 7h-2c-.552 0-1 .448-1 1v20c0 .553.448 1 1 1h2c.553 0 1-.447 1-1V8c0-.552-.447-1-1-1z"/><path fill="#FFF" d="M26.617 11.09l1.105 1.667c.305.46.179 1.081-.281 1.386L10.769 25.191c-.461.305-1.081.179-1.386-.281l-1.105-1.667c-.305-.461-.18-1.081.281-1.386L25.231 10.81c.461-.306 1.081-.18 1.386.28z"/><path fill="#FFF" d="M9.383 11.09l-1.105 1.667c-.305.46-.179 1.081.281 1.386L25.231 25.19c.461.305 1.081.179 1.386-.281l1.105-1.667c.305-.461.18-1.081-.281-1.386L10.769 10.809c-.461-.305-1.081-.179-1.386.281z"/></svg> \ No newline at end of file |
