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/1f5fc.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/1f5fc.svg')
-rw-r--r-- | public/emoji/1f5fc.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f5fc.svg b/public/emoji/1f5fc.svg index 40ee1e93b..92fd6ae01 100644 --- a/public/emoji/1f5fc.svg +++ b/public/emoji/1f5fc.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><clipPath id="clipPath40" clipPathUnits="userSpaceOnUse"><path id="path42" d="m 17,29 -1,-10 4,0 -1,10 -2,0 z"/></clipPath><clipPath id="clipPath50" clipPathUnits="userSpaceOnUse"><path id="path52" 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(36,4)" id="g20"><path id="path22" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0,-4 -4,-4 l -28,0 c 0,0 -4,0 -4,4 l 0,28 c 0,4 4,4 4,4 l 28,0 c 4,0 4,-4 4,-4 L 0,0 Z"/></g><g transform="translate(18,31)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,0 0,-3 2,0 0,3 -1,0 z"/></g><g transform="translate(19,33)" id="g28"><path id="path30" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0,1 -1,1 -2,1 -2,0 -2,0 l 0,-2 2,0 0,2 z"/></g><g transform="translate(17,29)" id="g32"><path id="path34" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1,-10 3,-10 2,0 0,0 Z"/></g></g></g><g id="g36"><g clip-path="url(#clipPath40)" id="g38"><path id="path44" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 15,23 6,0 0,3 -6,0 0,-3 z"/></g></g><g id="g46"><g clip-path="url(#clipPath50)" id="g48"><path id="path54" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 14,16 8,0 0,4 -8,0 0,-4 z"/><path id="path56" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 15,12 6,0 0,4 -6,0 0,-4 z"/><g transform="translate(15,16)" id="g58"><path id="path60" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0,-11 -10,-16 l 3,0 c 0,0 7,3 9,16 L 0,0 Z"/></g><g transform="translate(21,16)" id="g62"><path id="path64" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0,-11 10,-16 l -3,0 c 0,0 -7,3 -9,16 l 2,0 z"/></g><path id="path66" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 19,0 -2,0 0,13 2,0 0,-13 z"/><g transform="translate(8,0)" id="g68"><path id="path70" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 5,3 10,3 15,3 20,0 20,0 l 0,1.884 C 20,1.884 15,5 10,5 5,5 0,1.884 0,1.884 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#BE1931" d="M16.103 26h3v10h-3z"/><path fill="#DD2E44" d="M20.719 19.459l-6.233.002c-.029.104-2.745 9.524-12.025 16.539h5.825c2.453-1.656 5.72-2.678 9.316-2.678 3.596 0 6.864 1.022 9.317 2.678h5.827c-9.245-6.998-11.998-16.437-12.027-16.541zm-3.116 10.863c-2.151 0-4.202.329-6.093.906 1.28-1.659 2.303-3.265 3.119-4.717h5.947c.816 1.453 1.839 3.058 3.119 4.717-1.891-.578-3.941-.906-6.092-.906z"/><path fill="#DD2E44" d="M14.539 16.038c-.225 1.239-.487 2.437-.785 3.5h7.755c-.299-1.063-.56-2.261-.785-3.5h-6.185z"/><path fill="#CDD6DD" d="M23.42 19.586l-.875-.642c-.045-.033-.101-.051-.158-.051H12.84c-.057 0-.113.018-.158.051l-.875.642c-.069.051-.107.132-.102.215 0 0 .204 3.441.265 3.552.073.133.508.48.588.48h10.111c.08 0 .514-.346.588-.48.062-.112.265-3.552.265-3.552.006-.083-.032-.164-.102-.215zm-3.221-6.881h-5.136c-.148 1.085-.322 2.22-.524 3.333h6.184c-.202-1.113-.376-2.248-.524-3.333z"/><path fill="#DD2E44" d="M19.774 9.205h-4.286c-.108 1.002-.249 2.212-.425 3.5h5.136c-.176-1.288-.316-2.498-.425-3.5z"/><path fill="#CDD6DD" d="M19.657 8.089c-.025.004-4.021.002-4.051-.003-.034.334-.073.704-.118 1.119h4.286l-.117-1.116z"/><path fill="#AAB8C2" d="M19.657 8.089c-.059-.571-.135-1.281-.135-1.281h-3.781s-.076.709-.135 1.278c.03.005 4.026.007 4.051.003z"/><path fill="#E1E8ED" d="M15.175 5.901v1.318c0 .276.233.5.521.5h3.888c.287 0 .521-.224.521-.5V5.901h-4.93z"/><path fill="#DD2E44" d="M19.583 4.083h-1.099L18.279.325c0-.097-.082-.175-.182-.175h-.848c-.101 0-.182.078-.182.175l-.205 3.758h-1.166c-.287 0-.521.224-.521.5v1.318h4.929V4.583c0-.276-.233-.5-.521-.5z"/></svg> \ No newline at end of file |