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/1f4a4.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/1f4a4.svg')
-rw-r--r-- | public/emoji/1f4a4.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f4a4.svg b/public/emoji/1f4a4.svg index 83df1a48d..b713e97a6 100644 --- a/public/emoji/1f4a4.svg +++ b/public/emoji/1f4a4.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(33,17)" id="g20"><path id="path22" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.187,0 2,-0.786 2,-2 2,-3.073 1.017,-4 0,-4 l -11,0 c -1.496,0 -2,0.814 -2,2 0,0.565 0.632,1.492 1,2 l 8,12 -7,0 c -1.128,0 -2,0.843 -2,2 0,1.073 0.929,2 2,2 L 0,16 C 1.639,16 2,14.988 2,14 2,13.379 1.365,12.48 1,12 L -7,0 0,0 Z"/></g><g transform="translate(17,12)" id="g24"><path id="path26" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.633,0 1,-0.352 1,-1 1,-1.573 0.542,-2 0,-2 l -6,0 c -0.798,0 -1,0.367 -1,1 0,0.301 0.337,0.73 0.533,1 L -2,6 -6,6 c -0.602,0 -1,0.384 -1,1 0,0.573 0.428,1 1,1 L 0,8 C 0.874,8 1,7.527 1,7 1,6.669 0.662,6.123 0.467,5.867 L -4,0 0,0 Z"/></g><g transform="translate(8,5)" id="g28"><path id="path30" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.633,0 1,-0.353 1,-1 1,-1.573 0.542,-2 0,-2 l -6,0 c -0.798,0 -1,0.367 -1,1 0,0.301 0.337,0.729 0.533,1 L -2,6 -6,6 c -0.602,0 -1,0.384 -1,1 0,0.572 0.428,1 1,1 L 0,8 C 0.874,8 1,7.527 1,7 1,6.669 0.662,6.123 0.467,5.867 L -4,0 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#4289C1" d="M33 19c1.187 0 2 .786 2 2 0 1.073-.983 2-2 2H22c-1.496 0-2-.813-2-2 0-.565.632-1.492 1-2l8-12h-7c-1.128 0-2-.843-2-2 0-1.073.929-2 2-2h11c1.639 0 2 1.012 2 2 0 .621-.635 1.519-1 2l-8 12h7zm-16 5c.633 0 1 .353 1 1 0 .573-.458 1-1 1h-6c-.798 0-1-.367-1-1 0-.301.337-.729.533-1L15 18h-4c-.602 0-1-.384-1-1 0-.573.428-1 1-1h6c.874 0 1 .473 1 1 0 .331-.338.877-.533 1.133L13 24h4zm-9 7c.633 0 1 .353 1 1 0 .573-.458 1-1 1H2c-.798 0-1-.367-1-1 0-.301.337-.729.533-1L6 25H2c-.602 0-1-.384-1-1 0-.572.428-1 1-1h6c.874 0 1 .473 1 1 0 .331-.338.877-.533 1.133L4 31h4z"/></svg> \ No newline at end of file |