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/1f4b4.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/1f4b4.svg')
-rw-r--r-- | public/emoji/1f4b4.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f4b4.svg b/public/emoji/1f4b4.svg index 6d9d73854..5db237d4e 100644 --- a/public/emoji/1f4b4.svg +++ b/public/emoji/1f4b4.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(2,30)" id="g20"><path id="path22" style="fill:#fdd888;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2,0 -2,-2 -2,-2 l 0,-20 c 0,0 0,-2 2,-2 l 32,0 c 2,0 2,2 2,2 l 0,20 c 0,0 0,2 -2,2 L 0,0 Z"/></g><path id="path24" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 23,5.937 -10,0 0,24.062 10,0 0,-24.062 z"/><g transform="translate(5.7432,17.8574)" id="g26"><path id="path28" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2.375,0 c -0.397,0 -0.709,0.189 -0.709,0.57 0,0.383 0.312,0.574 0.709,0.574 l 1.664,0 -2.772,4.28 c -0.173,0.259 -0.26,0.449 -0.26,0.691 0,0.33 0.33,0.573 0.607,0.573 0.278,0 0.554,-0.122 0.797,-0.485 L 0.762,1.541 3.864,6.203 c 0.243,0.363 0.52,0.485 0.798,0.485 0.276,0 0.605,-0.243 0.605,-0.573 0,-0.242 -0.086,-0.432 -0.26,-0.691 l -2.772,-4.28 1.663,0 C 4.297,1.144 4.609,0.953 4.609,0.57 4.609,0.189 4.297,0 3.898,0 l -2.373,0 0,-1.23 2.373,0 c 0.399,0 0.711,-0.192 0.711,-0.573 0,-0.381 -0.312,-0.571 -0.711,-0.571 l -2.373,0 0,-2.668 C 1.525,-5.544 1.213,-5.857 0.762,-5.857 0.312,-5.857 0,-5.544 0,-5.042 l 0,2.668 -2.375,0 c -0.397,0 -0.709,0.19 -0.709,0.571 0,0.381 0.312,0.573 0.709,0.573 L 0,-1.23 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FDD888" d="M2 6C0 6 0 8 0 8v20s0 2 2 2h32c2 0 2-2 2-2V8s0-2-2-2H2z"/><path fill="#9AAAB4" d="M13 6h10v24.062H13z"/><path fill="#67757F" d="M5.743 18.143H3.369c-.398 0-.709-.189-.709-.57 0-.383.312-.573.709-.573h1.664l-2.772-4.28c-.174-.26-.261-.45-.261-.693 0-.33.33-.573.607-.573.278 0 .554.122.797.485l3.102 4.662 3.102-4.662c.243-.364.52-.485.797-.485.276 0 .605.243.605.573 0 .243-.086.432-.259.691l-2.772 4.28h1.664c.399 0 .711.191.711.573 0 .381-.312.57-.711.57H7.269v1.23h2.373c.399 0 .711.192.711.573 0 .381-.312.571-.711.571H7.269v2.668c0 .504-.312.817-.764.817-.451 0-.762-.313-.762-.815v-2.668H3.369c-.398 0-.709-.19-.709-.571 0-.381.312-.573.709-.573h2.375v-1.23z"/></svg> \ No newline at end of file |