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/1f6c2.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/1f6c2.svg')
-rw-r--r-- | public/emoji/1f6c2.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f6c2.svg b/public/emoji/1f6c2.svg index cb55bd488..2e9dfdf76 100644 --- a/public/emoji/1f6c2.svg +++ b/public/emoji/1f6c2.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(36,4)" id="g20"><path id="path22" style="fill:#226699;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 0,28 c 0,2.209 1.791,4 4,4 l 28,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(31,25)" id="g24"><path id="path26" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.313 -2.686,-6 -6,-6 -3.313,0 -6,2.687 -6,6 L 0,0 Z"/></g><g transform="translate(31,31)" id="g28"><path id="path30" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -12,0 c -0.553,0 -1,-0.448 -1,-1 0,-0.182 0.049,-0.569 0.134,-1.007 C -12.911,-2.005 -12.954,-2 -13,-2 c -1.104,0 -2,-0.448 -2,-1 0,-0.552 0.896,-1 2,-1 0.37,0 0.684,0.003 0.971,0.008 C -12.02,-3.994 -12.01,-4 -12,-4 l 12,0 c 0.553,0 1,2.448 1,3 0,0.552 -0.447,1 -1,1"/></g><g transform="translate(15,10)" id="g32"><path id="path34" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -5.013,0 -7.558,3.731 -7.664,3.891 -8.277,4.81 -8.028,6.052 -7.109,6.664 -6.19,7.279 -4.949,7.028 -4.336,6.109 -4.287,6.04 -2.827,4 0,4 2.85,4 4.322,6.088 4.336,6.109 4.948,7.028 6.189,7.279 7.109,6.664 8.028,6.052 8.276,4.81 7.664,3.891 7.559,3.731 5.013,0 0,0"/></g><g transform="translate(28,17)" id="g36"><path id="path38" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -7,0 c -1.104,0 -2,-0.895 -2,-2 l 0,-7 9,9 z"/></g><g transform="translate(30.8203,15.8203)" id="g40"><path id="path42" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -11.82,-11.82 c 0,-1.105 0.895,-2 2,-2 l 8,0 c 1.104,0 2,0.895 2,2 l 0,11 C 0.18,-0.527 0.113,-0.251 0,0"/></g><g transform="translate(12,32.96)" id="g44"><path id="path46" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -6,-1.43 C -6.154,-1.474 -6.295,-1.555 -6.426,-1.654 L -1,-2.92 c 0.552,-0.157 1,-0.733 1,-1.285 L 0,-10 c 0.552,0.157 1,0.732 1,1.285 l 0,8 C 1,-0.162 0.552,0.157 0,0"/></g><g transform="translate(10,19.2451)" id="g48"><path id="path50" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.448,-0.872 -1,-0.715 l -5,1.43 C -6.552,0.872 -7,1.447 -7,2 l 0,8 c 0,0.553 0.448,0.872 1,0.715 l 5,-1.43 C -0.448,9.128 0,8.552 0,8 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#269" d="M36 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v28z"/><path fill="#F5F8FA" d="M31 11c0 3.314-2.687 6-6 6s-6-2.686-6-6h12zm0-6H19c-.553 0-1 .448-1 1 0 .182.049.569.134 1.007C18.089 7.005 18.046 7 18 7c-1.104 0-2 .448-2 1s.896 1 2 1c.37 0 .684-.003.971-.008.009.002.019.008.029.008h12c.553 0 1-2.448 1-3s-.447-1-1-1zM15 26c-5.013 0-7.558-3.731-7.664-3.891-.613-.919-.364-2.161.555-2.774.919-.615 2.161-.364 2.773.555.049.07 1.509 2.11 4.336 2.11 2.85 0 4.322-2.088 4.336-2.109.612-.919 1.854-1.17 2.774-.555.919.612 1.167 1.854.555 2.774C22.559 22.269 20.013 26 15 26z"/><path fill="#F5F8FA" d="M28 19h-7c-1.104 0-2 .896-2 2v7l9-9zm2.82 1.18L19 32c0 1.104.896 2 2 2h8c1.104 0 2-.896 2-2V21c0-.293-.066-.569-.18-.82zM12 3.04L6 4.47c-.154.044-.295.125-.426.224L11 5.96c.552.157 1 .733 1 1.285v5.795c.552-.157 1-.732 1-1.285v-8c0-.553-.448-.872-1-.715z"/><path fill="#F5F8FA" d="M10 16.755c0 .553-.448.872-1 .715l-5-1.43c-.552-.157-1-.732-1-1.285v-8c0-.553.448-.872 1-.715l5 1.43c.552.157 1 .733 1 1.285v8z"/></svg> \ No newline at end of file |