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/1f1f8-1f1f7.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/1f1f8-1f1f7.svg')
-rw-r--r-- | public/emoji/1f1f8-1f1f7.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1f8-1f1f7.svg b/public/emoji/1f1f8-1f1f7.svg index d2b6e0fb5..c483fb95e 100644 --- a/public/emoji/1f1f8-1f1f7.svg +++ b/public/emoji/1f1f8-1f1f7.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(0,9)" id="g20"><path id="path22" style="fill:#377e3f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 1.791,-4 4,-4 l 28,0 c 2.209,0 4,1.791 4,4 L 36,1 0,1 0,0 Z"/></g><path id="path24" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,10 36,0 0,3 -36,0 0,-3 z"/><g transform="translate(32,31)" id="g26"><path id="path28" style="fill:#377e3f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -28,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-1 36,0 0,1 C 4,-1.791 2.209,0 0,0"/></g><path id="path30" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,23 36,0 0,3 -36,0 0,-3 z"/><g transform="translate(16.8325,19.1104)" id="g32"><path id="path34" style="fill:#b40a2d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1.167,3.593 2.335,0 6.113,0 3.056,-2.221 4.224,-5.814 1.167,-3.593 -1.889,-5.814 -0.721,-2.221 -3.778,0 0,0 Z m -16.833,-6.11 36,0 0,10 -36,0 0,-10 z"/></g><g transform="translate(14.9435,13.2966)" id="g36"><path id="path38" style="fill:#ecc81d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 3.056,2.221 6.113,0 4.945,3.593 8.002,5.814 4.224,5.814 3.056,9.407 1.889,5.814 -1.889,5.814 1.167,3.593 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#377E3F" d="M0 27c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4v-1H0v1z"/><path fill="#EEE" d="M0 23h36v3H0z"/><path fill="#377E3F" d="M32 5H4C1.791 5 0 6.791 0 9v1h36V9c0-2.209-1.791-4-4-4z"/><path fill="#EEE" d="M0 10h36v3H0z"/><path fill="#B40A2D" d="M0 23h36V13H0v10zm16.833-6.11L18 13.297l1.167 3.593h3.778l-3.057 2.221 1.167 3.593L18 20.483l-3.056 2.221 1.167-3.593-3.057-2.221h3.779z"/><path fill="#ECC81D" d="M14.944 22.703L18 20.483l3.056 2.22-1.167-3.593 3.056-2.22h-3.778L18 13.297l-1.167 3.593h-3.778l3.056 2.22z"/></svg> \ No newline at end of file |