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/1f3e1.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/1f3e1.svg')
-rw-r--r-- | public/emoji/1f3e1.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3e1.svg b/public/emoji/1f3e1.svg index b7fb3cc8a..b44b7288b 100644 --- a/public/emoji/1f3e1.svg +++ b/public/emoji/1f3e1.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(5.9424,3)" id="g20"><path id="path22" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.138,4.657 -0.507,8 -0.942,8 -1.377,8 -1.746,4.657 -1.884,0 L 0,0 Z"/></g><g transform="translate(16,15.5771)" id="g24"><path id="path26" style="fill:#a6d388;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-5.045 -2.238,-6.577 -5,-6.577 -2.761,0 -5,1.532 -5,6.577 0,5.044 4,12.423 5,12.423 1,0 5,-7.379 5,-12.423"/></g><g transform="translate(10,16.2686)" id="g28"><path id="path30" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-5.574 -2.238,-7.269 -5,-7.269 -2.761,0 -5,1.695 -5,7.269 0,5.577 4,13.731 5,13.731 1,0 5,-8.154 5,-13.731"/></g><g transform="translate(8,20)" id="g32"><path id="path34" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 13,13 26,0 26,-16 0,-16 0,0 Z"/></g><path id="path36" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 22,4 -1,0 0,16 1,0 0,-16 z"/><path id="path38" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 9,4 8,4 8,20 9,20 9,4 Z"/><path id="path40" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 33,4 1,0 0,16 -1,0 0,-16 z"/><g transform="translate(34,19)" id="g42"><path id="path44" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.256,0 -0.512,0.098 -0.707,0.293 L -13,12.586 -25.293,0.293 c -0.391,-0.391 -1.023,-0.391 -1.414,0 -0.391,0.391 -0.391,1.023 0,1.414 l 13,13 c 0.391,0.391 1.023,0.391 1.414,0 l 13,-13 C 1.098,1.316 1.098,0.684 0.707,0.293 0.512,0.098 0.256,0 0,0"/></g><g transform="translate(21,19)" id="g46"><path id="path48" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.256,0 -0.512,0.098 -0.707,0.293 -0.391,0.391 -0.391,1.023 0,1.414 l 6.5,6.5 c 0.391,0.391 1.023,0.391 1.414,0 0.391,-0.391 0.391,-1.023 0,-1.414 l -6.5,-6.5 C 0.512,0.098 0.256,0 0,0"/></g><path id="path50" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 17,4 -4,0 0,6 4,0 0,-6 z"/><path id="path52" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 29,6 -3,0 0,4 3,0 0,-4 z"/><path id="path54" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 25,6 2,0 0,4 -2,0 0,-4 z"/><path id="path56" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 30,6 -2,0 0,4 2,0 0,-4 z"/><path id="path58" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 17,15 -4,0 0,4 4,0 0,-4 z"/><path id="path60" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 30,15 -5,0 0,4 5,0 0,-4 z"/><g transform="translate(36,2)" id="g62"><path id="path64" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.895,-2 -2,-2 l -32,0 c -1.104,0 -2,0.895 -2,2 0,1.105 0.896,2 2,2 L -2,2 C -0.895,2 0,1.105 0,0"/></g><path id="path66" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 17,0 -4,0 0,4 4,0 0,-4 z"/></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#5C913B" d="M36 33.5c0 .828-.672 1.5-1.5 1.5h-33C.672 35 0 34.328 0 33.5S.672 32 1.5 32h33c.828 0 1.5.672 1.5 1.5z"/><path fill="#A0041E" d="M12.344 14.702h-2c-.276 0-.5-.224-.5-.5v-7c0-.276.224-.5.5-.5h2c.276 0 .5.224.5.5v7c0 .276-.224.5-.5.5z"/><path fill="#FFCC4D" d="M5.942 32c-.137-4.657-.506-8-.942-8-.435 0-.804 3.343-.941 8h1.883z"/><path fill="#77B255" d="M10 18.731C10 24.306 7.762 26 5 26c-2.761 0-5-1.694-5-7.269C0 13.154 4 5 5 5s5 8.154 5 13.731z"/><path fill="#FFE8B6" d="M8 16L21 3l13 13v16H8z"/><path fill="#FFCC4D" d="M21 16h1v16h-1z"/><path fill="#66757F" d="M34 17c-.256 0-.512-.098-.707-.293L21 4.414 8.707 16.707c-.391.391-1.023.391-1.414 0s-.391-1.023 0-1.414l13-13c.391-.391 1.023-.391 1.414 0l13 13c.391.391.391 1.023 0 1.414-.195.195-.451.293-.707.293z"/><path fill="#66757F" d="M21 17c-.256 0-.512-.098-.707-.293-.391-.391-.391-1.023 0-1.414l6.5-6.5c.391-.391 1.023-.391 1.414 0s.391 1.023 0 1.414l-6.5 6.5c-.195.195-.451.293-.707.293z"/><path fill="#C1694F" d="M13 26h4v6h-4z"/><path fill="#55ACEE" d="M13 17h4v4h-4zm12.5 0h4v4h-4zm0 9h4v4h-4z"/><path fill="#77B255" d="M10.625 29.991c0 1.613-.858 2.103-1.917 2.103-1.058 0-1.917-.49-1.917-2.103 0-1.613 1.533-3.973 1.917-3.973s1.917 2.359 1.917 3.973zm25.25 0c0 1.613-.858 2.103-1.917 2.103-1.058 0-1.917-.49-1.917-2.103 0-1.613 1.533-3.973 1.917-3.973.384 0 1.917 2.359 1.917 3.973z"/></svg> \ No newline at end of file |