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/1f3d2.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/1f3d2.svg')
-rw-r--r-- | public/emoji/1f3d2.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3d2.svg b/public/emoji/1f3d2.svg index 25513203c..9b0cd11e1 100644 --- a/public/emoji/1f3d2.svg +++ b/public/emoji/1f3d2.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,33)" id="g20"><path id="path22" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1,-1.295 -3.027,-3.803 -4.391,-5.671 -3.815,-5.225 -7.156,-6.454 -10.328,-7.632 -3.172,-1.177 -10.407,-1.029 -13.88,-0.853 -3.472,0.175 -5.735,0.579 -6.42,-0.415 -2.101,-3.053 -0.611,-6.482 2.427,-6.949 2.378,-0.367 9.544,0.32 12.899,0.616 3.356,0.297 7.024,1.3 8.283,1.785 1.259,0.483 2.279,0.88 2.597,1.643 0.318,0.765 1.876,2.818 3.783,5.917 C -3.955,-9.811 -1,-6.55 0,-5 l 0,5 z"/></g><g transform="translate(7,11.4092)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 3,0.114 7.055,0.487 9.309,0.687 2.289,0.202 4.704,0.732 6.42,1.203 L 15.305,8.673 C 14.961,8.542 14.619,8.414 14.28,8.288 11.108,7.11 3.876,7.259 0.403,7.435 0.262,7.441 0,7.451 0,7.459 L 0,0 Z"/></g><g transform="translate(17,8)" id="g28"><path id="path30" style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-4 c 0,-1.105 3.135,-2 7,-2 3.866,0 7,0.895 7,2 L 14,0 0,0 Z"/></g><g transform="translate(30.9961,8)" id="g32"><path id="path34" style="fill:#58595b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -3.134,-2 -7,-2 -3.865,0 -7,0.896 -7,2 0,1.105 3.135,2 7,2 3.866,0 7,-0.895 7,-2"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F4900C" d="M36 3c-1 1.295-3.027 3.803-4.391 5.671-3.816 5.225-7.156 6.454-10.328 7.632-3.172 1.178-10.407 1.029-13.88.854-3.473-.175-5.735-.579-6.42.415-2.102 3.053-.612 6.481 2.426 6.949 2.378.366 9.544-.32 12.899-.616 3.356-.297 7.024-1.301 8.283-1.785 1.259-.483 2.279-.88 2.597-1.644.318-.765 1.876-2.817 3.783-5.917C32.045 12.811 35 9.55 36 8V3z"/><path fill="#292F33" d="M7 24.591c3-.114 7.055-.487 9.309-.686 2.289-.202 4.704-.732 6.419-1.203l-.424-6.784c-.344.132-.686.259-1.024.385-3.172 1.178-10.405 1.029-13.877.854-.141-.008-.403-.017-.403-.025v7.459z"/><path fill="#231F20" d="M17 28v4c0 1.104 3.135 2 7 2 3.866 0 7-.896 7-2v-4H17z"/><ellipse fill="#58595B" cx="23.996" cy="28" rx="7" ry="2"/></svg> \ No newline at end of file |