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/26f1.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/26f1.svg')
-rw-r--r-- | public/emoji/26f1.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/26f1.svg b/public/emoji/26f1.svg index 582dceb0d..589f38501 100644 --- a/public/emoji/26f1.svg +++ b/public/emoji/26f1.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(34,5)" id="g20"><path id="path22" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -32,0 c -1.104,0 -2,-0.895 -2,-2 l 0,-2 0,-1 2,0 32,0 2,0 0,1 0,2 C 2,-0.895 1.105,0 0,0"/></g><g transform="translate(16.9961,3.5)" id="g24"><path id="path26" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.175,-0.809 -0.975,-1.323 -1.784,-1.148 -0.809,0.176 -1.323,0.975 -1.148,1.785 L 3.008,31 c 0.176,0.81 0.974,1.323 1.784,1.147 0.809,-0.175 1.323,-0.974 1.147,-1.784 L 0,0 Z"/></g><g transform="translate(21.3633,33.6929)" id="g28"><path id="path30" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -8.905,1.933 -17.359,-2.188 -18.882,-9.205 0,0 -0.424,-1.954 0.553,-2.166 0.977,-0.212 3.356,1.318 3.356,1.318 l 24.431,-5.303 c 0,0 1.53,-2.379 2.508,-2.591 0.977,-0.212 1.401,1.742 1.401,1.742 C 14.891,-9.188 8.905,-1.933 0,0"/></g><g transform="translate(21.3633,33.6929)" id="g32"><path id="path34" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -6.746,1.464 -13.45,-3.037 -14.973,-10.053 0,0 -0.424,-1.954 1.531,-2.379 1.954,-0.424 5.31,0.894 5.31,0.894 l 10.749,-2.333 c 0,0 2.508,-2.59 4.463,-3.015 1.954,-0.424 2.378,1.53 2.378,1.53 C 10.981,-8.339 6.746,-1.464 0,0"/></g><g transform="translate(21.3633,33.6929)" id="g36"><path id="path38" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.508,0.761 -6.609,-4.521 -8.132,-11.538 0,0 2.508,-2.59 4.462,-3.015 l 0.977,-0.212 c 1.955,-0.424 5.31,0.894 5.31,0.894 C 4.141,-6.854 3.509,-0.762 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFAC33" d="M34 31H2c-1.104 0-2 .896-2 2v3h36v-3c0-1.104-.896-2-2-2z"/><path fill="#66757F" d="M16.996 32.5c-.175.809-.975 1.323-1.784 1.147-.81-.176-1.324-.975-1.148-1.784L20.004 1.5c.176-.81.975-1.323 1.784-1.148.809.176 1.323.975 1.147 1.784L16.996 32.5z"/><path fill="#DD2E44" d="M21.363 2.307C12.458.375 4.004 4.495 2.481 11.512c0 0-.424 1.954.553 2.167.977.212 3.356-1.318 3.356-1.318l24.431 5.303s1.53 2.379 2.508 2.591c.977.212 1.401-1.742 1.401-1.742 1.524-7.018-4.461-14.273-13.367-16.206z"/><path fill="#E1E8ED" d="M21.363 2.307C14.617.843 7.914 5.344 6.391 12.36c0 0-.424 1.955 1.53 2.379s5.31-.894 5.31-.894l10.749 2.333s2.508 2.59 4.463 3.015c1.954.424 2.378-1.53 2.378-1.53 1.524-7.017-2.712-13.892-9.458-15.356z"/><path fill="#DD2E44" d="M21.363 2.307c-3.508-.761-6.609 4.521-8.132 11.538 0 0 2.507 2.591 4.462 3.015l.977.212c1.955.424 5.31-.894 5.31-.894 1.524-7.016.892-13.109-2.617-13.871z"/></svg> \ No newline at end of file |