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/1f1ee-1f1f1.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/1f1ee-1f1f1.svg')
-rw-r--r-- | public/emoji/1f1ee-1f1f1.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1ee-1f1f1.svg b/public/emoji/1f1ee-1f1f1.svg index a9680cc92..5cf324155 100644 --- a/public/emoji/1f1ee-1f1f1.svg +++ b/public/emoji/1f1ee-1f1f1.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="clipPath26" clipPathUnits="userSpaceOnUse"><path id="path28" 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 transform="translate(20.1996,16.191)" id="g12"><path id="path14" style="fill:#edecec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.933,0 0.466,0.809 0,0 Z"/></g><g transform="translate(17.5329,15.1911)" id="g16"><path id="path18" style="fill:#edecec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.467,-0.809 0.934,0 0,0 Z"/></g><path id="path20" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,11 36,11 36,25 0,25 0,11 Z"/><g id="g22"><g clip-path="url(#clipPath26)" id="g24"><g transform="translate(0.2935,28.5)" id="g30"><path id="path32" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 35.413,0 c -0.594,1.465 -2.028,2.5 -3.707,2.5 l -28,0 C 2.028,2.5 0.594,1.465 0,0"/></g><g transform="translate(21.1328,19.8086)" id="g34"><path id="path36" style="fill:#edecec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.934,0 -0.467,-0.808 0,0 Z"/></g><g transform="translate(15.8007,19.8086)" id="g38"><path id="path40" style="fill:#edecec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.934,0 -0.467,-0.808 0,0 Z"/></g><g transform="translate(19.0445,16.1914)" id="g42"><path id="path44" style="fill:#edecec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1.044,1.809 0,3.617 -2.089,3.617 -3.133,1.809 -2.089,0 0,0 Z"/></g><g transform="translate(15.3339,16.9998)" id="g46"><path id="path48" style="fill:#edecec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.467,-0.808 0.934,0 L 0,0 Z"/></g><g transform="translate(18,21.6177)" id="g50"><path id="path52" style="fill:#edecec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.467,-0.809 0.934,0 L 0,0 Z"/></g><g transform="translate(0.2935,28.5)" id="g54"><path id="path56" style="fill:#0038b8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.188,-0.464 -0.294,-0.969 -0.294,-1.5 l 0,-2 36,0 0,2 c 0,0.531 -0.105,1.036 -0.293,1.5 L 0,0 Z"/></g><g transform="translate(0.2935,7.5)" id="g58"><path id="path60" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 35.413,0 c -0.594,-1.465 -2.028,-2.5 -3.707,-2.5 l -28,0 C 2.028,-2.5 0.594,-1.465 0,0"/></g><g transform="translate(0.2935,7.5)" id="g62"><path id="path64" style="fill:#0038b8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.188,0.464 -0.294,0.969 -0.294,1.5 l 0,2 36,0 0,-2 C 35.706,0.969 35.601,0.464 35.413,0 L 0,0 Z"/></g><g transform="translate(15.3339,16.9998)" id="g66"><path id="path68" style="fill:#0038b8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.467,-0.808 -0.934,0 L 0,0 Z M 0.467,2.809 0,2 l -0.467,0.809 0.934,0 z m 1.155,0 2.089,0 L 4.755,1 3.711,-0.808 1.622,-0.808 0.577,1 1.622,2.809 Z m 1.044,1.809 0.467,-0.809 -0.934,0 0.467,0.809 z M 5.332,0 5.799,-0.808 4.865,-0.808 5.332,0 Z M 5.799,2.809 5.332,2 4.865,2.809 l 0.934,0 z m -3.133,-5.426 -0.467,0.809 0.934,0 -0.467,-0.809 z m -1.622,0.809 1.622,-2.809 1.622,2.809 3.243,0 L 5.91,1 l 1.621,2.809 -3.243,0 -1.622,2.809 -1.622,-2.809 -3.243,0 1.621,-2.809 -1.621,-2.808 3.243,0 z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#EDECEC" d="M20.666 19l-.467.809h.934zM18 21.618l.467-.809h-.934z"/><path fill="#EEE" d="M0 25h36V11H0v14zM.294 7.5h35.413C35.113 6.035 33.678 5 32 5H4C2.322 5 .887 6.035.294 7.5z"/><path fill="#EDECEC" d="M21.133 16.191h-.934l.467.809zm-5.332 0h-.934l.467.809zm3.243 3.618L20.089 18l-1.045-1.809h-2.088L15.911 18l1.045 1.809zM15.334 19l-.467.809h.934zM18 14.382l-.467.809h.934z"/><path fill="#0038B8" d="M.294 7.5C.106 7.964 0 8.469 0 9v2h36V9c0-.531-.106-1.036-.294-1.5H.294z"/><path fill="#EEE" d="M.294 28.5h35.413C35.113 29.965 33.678 31 32 31H4C2.322 31 .887 29.965.294 28.5z"/><path fill="#0038B8" d="M.294 28.5C.106 28.036 0 27.531 0 27v-2h36v2c0 .531-.106 1.036-.294 1.5H.294zm16.084-7.691L18 23.618l1.622-2.809h3.243L21.244 18l1.622-2.809h-3.243L18 12.382l-1.622 2.809h-3.243L14.756 18l-1.622 2.809h3.244zm1.622.809l-.467-.809h.934l-.467.809zm3.133-5.427l-.467.809-.467-.808h.934zM20.666 19l.467.808h-.934l.467-.808zM18 14.382l.467.809h-.934l.467-.809zm-1.044 1.809h2.089L20.089 18l-1.044 1.809h-2.089L15.911 18l1.045-1.809zm-1.155 0l-.467.809-.467-.808h.934zM15.334 19l.467.808h-.934l.467-.808z"/></svg> \ No newline at end of file |