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/1f1e7-1f1f6.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/1f1e7-1f1f6.svg')
-rw-r--r-- | public/emoji/1f1e7-1f1f6.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1e7-1f1f6.svg b/public/emoji/1f1e7-1f1f6.svg index 25fad1393..bde492170 100644 --- a/public/emoji/1f1e7-1f1f6.svg +++ b/public/emoji/1f1e7-1f1f6.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 4,31 C 1.791,31 0,29.209 0,27 L 0,27 0,9 C 0,6.791 1.791,5 4,5 l 0,0 28,0 c 2.209,0 4,1.791 4,4 l 0,0 0,18 c 0,2.209 -1.791,4 -4,4 l 0,0 -28,0 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"><path id="path20" style="fill:#eeeded;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,5 36,5 36,31 0,31 0,5 Z"/><g transform="translate(36,5)" id="g22"><path id="path24" style="fill:#012a87;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -36,0 0,26 0,0 Z"/></g><g transform="translate(0,31)" id="g26"><path id="path28" style="fill:#f9d90f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,-10.833 13.25,0 0,0 Z"/></g><g transform="translate(11,15.9517)" id="g30"><path id="path32" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.67,0 -4.842,2.172 -4.842,4.842 0,2.671 2.172,4.843 4.842,4.843 2.67,0 4.842,-2.172 4.842,-4.843 C 4.842,2.172 2.67,0 0,0 M 5.513,4.154 6.706,4.842 5.513,5.531 C 5.201,8.046 3.203,10.044 0.688,10.356 L 0,11.548 -0.688,10.356 C -3.203,10.044 -5.201,8.046 -5.513,5.531 L -6.706,4.842 -5.513,4.154 c 0.312,-2.515 2.31,-4.513 4.825,-4.825 L 0,-1.863 0.688,-0.671 c 2.515,0.312 4.513,2.31 4.825,4.825"/></g><g transform="translate(12.9139,20.7942)" id="g34"><path id="path36" style="fill:#dc171d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.957,1.658 -1.914,0 -0.957,1.657 -0.957,-1.657 -1.914,0 0.957,-1.658 -0.957,-1.657 1.914,0 0.957,-1.658 0.957,1.658 1.914,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="#EEEDED" d="M1.369 30.011L34.633 5.99C33.93 5.376 33.006 5 32 5H13.25L0 15.833V27c0 1.203.529 2.278 1.369 3.011z"/><path fill="#012A87" d="M34.633 5.99L1.369 30.011C2.072 30.625 2.994 31 4 31h28c2.209 0 4-1.791 4-4V9c0-.552-.112-1.078-.314-1.557-.239-.563-.599-1.057-1.053-1.453z"/><path fill="#F9D90F" d="M4 5C1.791 5 0 6.791 0 9v6.833L13.25 5H4z"/><path d="M16.513 15.894l1.192-.688-1.192-.688c-.312-2.515-2.31-4.513-4.825-4.825L11 8.5l-.688 1.192c-2.515.312-4.513 2.31-4.825 4.825l-1.192.688 1.192.688c.312 2.515 2.31 4.513 4.825 4.825L11 21.912l.688-1.192c2.515-.313 4.513-2.311 4.825-4.826zM11 20.048c-2.67 0-4.843-2.172-4.843-4.842 0-2.67 2.172-4.842 4.843-4.842s4.842 2.172 4.842 4.842c0 2.67-2.172 4.842-4.842 4.842z"/><path fill="#DC171D" d="M12.914 15.206l.957-1.658h-1.914L11 11.891l-.957 1.657H8.129l.957 1.658-.957 1.657h1.914L11 18.521l.957-1.658h1.914z"/></svg> \ No newline at end of file |