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/1f3e2.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/1f3e2.svg')
-rw-r--r-- | public/emoji/1f3e2.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3e2.svg b/public/emoji/1f3e2.svg index 71a433061..8d06ecd20 100644 --- a/public/emoji/1f3e2.svg +++ b/public/emoji/1f3e2.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(34,23)" id="g20"><path id="path22" style="fill:#dac8b1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -6,0 c -1.104,0 -2,0.896 -2,2 l 0,2 c 0,1.105 0.896,2 2,2 l 6,0 C -0.895,4 0,3.105 0,2 L 0,0 Z"/></g><g transform="translate(12,23)" id="g24"><path id="path26" style="fill:#dac8b1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -6,0 c -1.104,0 -2,0.896 -2,2 l 0,2 c 0,1.105 0.896,2 2,2 l 6,0 C -0.895,4 0,3.105 0,2 L 0,0 Z"/></g><g transform="translate(36,2)" id="g28"><path id="path30" style="fill:#f1dcc1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.895,-2 -2,-2 l -32,0 c -1.104,0 -2,0.895 -2,2 l 0,21 c 0,1.105 0.896,2 2,2 l 32,0 c 1.105,0 2,-0.895 2,-2 L 0,0 Z"/></g><g transform="translate(22,27)" id="g32"><path id="path34" style="fill:#dac8b1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,2 C 0,2.738 -0.404,3.376 -1,3.723 L -1,4 c 0,1.104 -0.895,2 -2,2 L -5,6 C -6.104,6 -7,5.104 -7,4 L -7,3.723 C -7.595,3.376 -8,2.738 -8,2 l 0,-2 -1,0 0,-2 0,-25 10,0 0,25 0,2 -1,0 z"/></g><path id="path36" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16,27 -2,0 0,2 2,0 0,-2 z"/><path id="path38" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 20,27 2,0 0,2 -2,0 0,-2 z"/><path id="path40" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 19,27 -2,0 0,2 2,0 0,-2 z"/><path id="path42" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 17,7 -2,0 0,14 2,0 0,-14 z"/><path id="path44" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 21,7 -2,0 0,14 2,0 0,-14 z"/><path id="path46" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26,7 -2,0 0,12 2,0 0,-12 z"/><path id="path48" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 30,7 -2,0 0,12 2,0 0,-12 z"/><path id="path50" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 34,7 -2,0 0,12 2,0 0,-12 z"/><path id="path52" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 4,7 2,7 2,19 4,19 4,7 Z"/><path id="path54" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 8,7 6,7 6,19 8,19 8,7 Z"/><path id="path56" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 12,7 -2,0 0,12 2,0 0,-12 z"/><path id="path58" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 4,4 2,4 2,6 4,6 4,4 Z"/><path id="path60" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 8,4 6,4 6,6 8,6 8,4 Z"/><path id="path62" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 12,4 -2,0 0,2 2,0 0,-2 z"/><path id="path64" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 17,4 -2,0 0,2 2,0 0,-2 z"/><path id="path66" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 21,4 -2,0 0,2 2,0 0,-2 z"/><path id="path68" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26,4 -2,0 0,2 2,0 0,-2 z"/><path id="path70" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 30,4 -2,0 0,2 2,0 0,-2 z"/><path id="path72" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 34,4 -2,0 0,2 2,0 0,-2 z"/><path id="path74" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 4,0 2,0 2,3 4,3 4,0 Z"/><path id="path76" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 8,0 6,0 6,3 8,3 8,0 Z"/><path id="path78" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 12,0 -2,0 0,3 2,0 0,-3 z"/><path id="path80" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 17,0 -2,0 0,3 2,0 0,-3 z"/><path id="path82" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 21,0 -2,0 0,3 2,0 0,-3 z"/><path id="path84" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26,0 -2,0 0,3 2,0 0,-3 z"/><path id="path86" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 28,0 2,0 0,3 -2,0 0,-3 z"/><path id="path88" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 34,0 -2,0 0,3 2,0 0,-3 z"/></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#DAC8B1" d="M34 13c0 1.104-.896 2-2 2h-6c-1.104 0-2-.896-2-2v-2c0-1.104.896-2 2-2h6c1.104 0 2 .896 2 2v2zm-22 0c0 1.104-.896 2-2 2H4c-1.104 0-2-.896-2-2v-2c0-1.104.896-2 2-2h6c1.104 0 2 .896 2 2v2z"/><path fill="#F1DCC1" d="M36 34c0 1.104-.896 2-2 2H2c-1.104 0-2-.896-2-2V13c0-1.104.896-2 2-2h32c1.104 0 2 .896 2 2v21z"/><path fill="#DAC8B1" d="M22 9V7c0-.738-.404-1.376-1-1.723V5c0-1.104-.896-2-2-2h-2c-1.104 0-2 .896-2 2v.277c-.595.347-1 .985-1 1.723v2h-1v27h10V9h-1z"/><path fill="#55ACEE" d="M14 7h2v2h-2zm6 0h2v2h-2zm-3 0h2v2h-2z"/><path fill="#3B88C3" d="M15 15h2v14h-2zm4 0h2v14h-2z"/><path fill="#55ACEE" d="M24 17h2v12h-2zm4 0h2v12h-2zm4 0h2v12h-2zM2 17h2v12H2zm4 0h2v12H6zm4 0h2v12h-2zM2 30h2v2H2zm4 0h2v2H6zm4 0h2v2h-2z"/><path fill="#3B88C3" d="M15 30h2v2h-2zm4 0h2v2h-2z"/><path fill="#55ACEE" d="M24 30h2v2h-2zm4 0h2v2h-2zm4 0h2v2h-2z"/><path fill="#66757F" d="M2 33h2v3H2zm4 0h2v3H6zm4 0h2v3h-2zm5 0h2v3h-2zm4 0h2v3h-2zm5 0h2v3h-2zm4 0h2v3h-2zm4 0h2v3h-2z"/></svg> \ No newline at end of file |