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/1f4c9.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/1f4c9.svg')
-rw-r--r-- | public/emoji/1f4c9.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f4c9.svg b/public/emoji/1f4c9.svg index 1989d48fa..ac8c258cc 100644 --- a/public/emoji/1f4c9.svg +++ b/public/emoji/1f4c9.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(35,4)" id="g20"><path id="path22" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -26,0 c -2.209,0 -4,1.791 -4,4 l 0,28 c 0,2.209 1.791,4 4,4 l 26,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><path id="path24" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26,10 5,0 0,-5 -5,0 0,5 z m -7,0 5,0 0,-5 -5,0 0,5 z m -7,0 5,0 0,-5 -5,0 0,5 z m -7,0 5,0 0,-5 -5,0 0,5 z m 5,16 -5,0 0,5 5,0 0,-5 z m 7,0 -5,0 0,5 5,0 0,-5 z m 7,0 -5,0 0,5 5,0 0,-5 z m 2,5 5,0 0,-5 -5,0 0,5 z m 0,-7 5,0 0,-5 -5,0 0,5 z m 0,-7 5,0 0,-5 -5,0 0,5 z m -7,0 5,0 0,-5 -5,0 0,5 z m -7,0 5,0 0,-5 -5,0 0,5 z m -2,-5 -5,0 0,5 5,0 0,-5 z m 0,7 -5,0 0,5 5,0 0,-5 z m 9,5 5,0 0,-5 -5,0 0,5 z m -2,-5 -5,0 0,5 5,0 0,-5 z M 32,33 4,33 C 3.447,33 3,32.552 3,32 L 3,4 C 3,3.447 3.447,3 4,3 l 28,0 c 0.553,0 1,0.447 1,1 l 0,28 c 0,0.552 -0.447,1 -1,1"/><g transform="translate(31.002,3)" id="g26"><path id="path28" style="fill:#3b94d9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.721,0 -1.416,0.39 -1.773,1.072 l -9.739,18.59 -6.076,-6.076 c -0.446,-0.447 -1.076,-0.66 -1.704,-0.565 -0.626,0.092 -1.171,0.474 -1.471,1.031 l -7,13 c -0.524,0.972 -0.16,2.185 0.813,2.709 0.974,0.523 2.186,0.159 2.709,-0.813 l 5.725,-10.633 6.1,6.099 c 0.45,0.45 1.089,0.659 1.716,0.563 0.629,-0.096 1.175,-0.485 1.47,-1.049 l 11,-21 C 2.282,1.949 1.904,0.741 0.926,0.229 0.63,0.073 0.312,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M31 2H5C3.343 2 2 3.343 2 5v26c0 1.657 1.343 3 3 3h26c1.657 0 3-1.343 3-3V5c0-1.657-1.343-3-3-3z"/><path fill="#E1E8ED" d="M31 1H5C2.791 1 1 2.791 1 5v26c0 2.209 1.791 4 4 4h26c2.209 0 4-1.791 4-4V5c0-2.209-1.791-4-4-4zm0 2c1.103 0 2 .897 2 2v4h-6V3h4zm-4 16h6v6h-6v-6zm0-2v-6h6v6h-6zM25 3v6h-6V3h6zm-6 8h6v6h-6v-6zm0 8h6v6h-6v-6zM17 3v6h-6V3h6zm-6 8h6v6h-6v-6zm0 8h6v6h-6v-6zM3 5c0-1.103.897-2 2-2h4v6H3V5zm0 6h6v6H3v-6zm0 8h6v6H3v-6zm2 14c-1.103 0-2-.897-2-2v-4h6v6H5zm6 0v-6h6v6h-6zm8 0v-6h6v6h-6zm12 0h-4v-6h6v4c0 1.103-.897 2-2 2z"/><path fill="#3B94D9" d="M31.002 33c-.721 0-1.416-.39-1.774-1.072l-9.738-18.59-6.076 6.076c-.446.447-1.076.66-1.705.564-.626-.092-1.171-.474-1.47-1.03l-7-13c-.524-.973-.16-2.186.813-2.709.975-.523 2.186-.16 2.709.812l5.726 10.633 6.1-6.099c.45-.45 1.089-.659 1.716-.563.629.096 1.175.485 1.47 1.049l11 21c.513.979.135 2.187-.844 2.699-.297.157-.614.23-.927.23z"/></svg> \ No newline at end of file |