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/1f1e9-1f1ef.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/1f1e9-1f1ef.svg')
-rw-r--r-- | public/emoji/1f1e9-1f1ef.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1e9-1f1ef.svg b/public/emoji/1f1e9-1f1ef.svg index a4daa6f94..42cbb243d 100644 --- a/public/emoji/1f1e9-1f1ef.svg +++ b/public/emoji/1f1e9-1f1ef.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(32,31)" id="g20"><path id="path22" style="fill:#6ab2e7;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -28,0 c -1.016,0 -1.94,-0.382 -2.646,-1.006 L -14.5,-13 4,-13 4,-4 C 4,-1.791 2.209,0 0,0"/></g><g transform="translate(32,5)" id="g24"><path id="path26" style="fill:#12ad2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -28,0 c -1.016,0 -1.94,0.382 -2.646,1.006 L -14.5,13 4,13 4,4 C 4,1.791 2.209,0 0,0"/></g><g transform="translate(1.3826,6.0271)" id="g28"><path id="path30" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 16.117,11.973 -0.029,23.967 c -0.828,-0.733 -1.354,-1.801 -1.354,-2.994 l 0,-9 0,-8.5 C -1.383,1.993 -0.845,0.79 0,0"/></g><g transform="translate(6.5001,21.5)" id="g32"><path id="path34" style="fill:#d7141a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.826,-2.543 2.674,0 L 1.337,-4.114 2.163,-6.657 0,-5.086 l -2.163,-1.571 0.826,2.543 -2.163,1.571 2.674,0 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#6AB2E7" d="M32 5H4c-1.016 0-1.94.382-2.646 1.006L17.5 18H36V9c0-2.209-1.791-4-4-4z"/><path fill="#12AD2B" d="M32 31H4c-1.016 0-1.94-.382-2.646-1.006L17.5 18H36v9c0 2.209-1.791 4-4 4z"/><path fill="#EEE" d="M1.383 29.973L17.5 18 1.354 6.006C.525 6.739 0 7.807 0 9v17.5c0 1.48.537 2.683 1.383 3.473z"/><path fill="#D7141A" d="M6.5 14.5l.826 2.543H10l-2.163 1.572.826 2.543L6.5 19.586l-2.163 1.572.826-2.543L3 17.043h2.674L6.5 14.5z"/></svg> \ No newline at end of file |