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/1f46d.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/1f46d.svg')
-rw-r--r-- | public/emoji/1f46d.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f46d.svg b/public/emoji/1f46d.svg index fae1da2d4..29d2b8597 100644 --- a/public/emoji/1f46d.svg +++ b/public/emoji/1f46d.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(10.9995,36)" id="g20"><path id="path22" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.264,0 -2.435,-0.393 -3.402,-1.061 -3.598,-1.031 -3.795,-1 -3.999,-1 c -2.209,0 -4,-1.791 -4,-4 l 0,-6 c 0,-3.866 3.133,-7 7,-7 3.866,0 7,3.134 7,7 l 0,4.999 C 6.001,-2.686 3.314,0 0,0"/></g><path id="path24" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 9,1 6,1 6,9 9,9 9,1 Z"/><path id="path26" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 14,1 -3,0 0,8 3,0 0,-8 z"/><path id="path28" style="fill:#f9ca55;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 9,8 6,8 6,9 9,9 9,8 Z"/><path id="path30" style="fill:#f9ca55;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 14,8 -3,0 0,1 3,0 0,-1 z"/><g transform="translate(5,0)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,1 C 0,1 0,2 2,2 4,2 4,1 4,1 L 4,0 0,0 Z"/></g><g transform="translate(11,0)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,1 C 0,1 0,2 2,2 4,2 4,1 4,1 L 4,0 0,0 Z"/></g><g transform="translate(0.999,10)" id="g40"><path id="path42" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.164,0 -0.331,0.04 -0.485,0.126 -0.482,0.269 -0.657,0.877 -0.388,1.359 l 5,9.001 c 0.268,0.482 0.876,0.657 1.36,0.388 0.482,-0.268 0.657,-0.877 0.388,-1.36 l -5,-8.999 C 0.692,0.186 0.352,0 0,0"/></g><g transform="translate(19.001,10)" id="g44"><path id="path46" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.352,0 -0.692,0.186 -0.875,0.515 l -5,8.999 c -0.269,0.483 -0.094,1.092 0.388,1.36 0.484,0.269 1.092,0.094 1.36,-0.388 l 5,-9.001 C 1.142,1.003 0.968,0.395 0.484,0.126 0.331,0.04 0.164,0 0,0"/></g><g transform="translate(4.0005,9)" id="g48"><path id="path50" style="fill:#e75a70;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 12,0 -2,6 0,4 2,0 0,1 c 0,1.105 -0.896,2 -2,2 L 8,13 4,13 2,13 C 0.895,13 0,12.105 0,11 L 0,10 2,10 2,6 0,0 Z"/></g><path id="path52" style="fill:#da2f47;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 14.001,15 -8,0 0,2 8,0 0,-2 z"/><g transform="translate(8,25)" id="g54"><path id="path56" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-4 c 0,-1.104 0.896,-2 2,-2 1.105,0 2,0.896 2,2 L 4,0 0,0 Z"/></g><g transform="translate(12,25)" id="g58"><path id="path60" style="fill:#f9ca55;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4,-0.019 -4,-4 c 0,0 2,-1 4,0 l 0,4 z"/></g><g transform="translate(15,33)" id="g62"><path id="path64" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -10,0 0,-6 0,-0.001 C -10,-8.763 -7.762,-11 -5.001,-11 -2.239,-11 0,-8.763 0,-6.001 L 0,-6 0,0 Z"/></g><g transform="translate(8,33)" id="g66"><path id="path68" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0,-4 8,-4 L 8,0 0,0 Z"/></g><g transform="translate(8,33)" id="g70"><path id="path72" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0,-4 -4,-4 l 0,4 4,0 z"/></g><g transform="translate(12,24)" id="g74"><path id="path76" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 -2,0 c 0,0 0,-1 2,-1 2,0 2,1 2,1"/></g><g transform="translate(8,27.5)" id="g78"><path id="path80" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 -1,0.276 -0.776,0.5 -0.5,0.5 -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(13,27.5)" id="g82"><path id="path84" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 -1,0.276 -0.776,0.5 -0.5,0.5 -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(9,26)" id="g86"><path id="path88" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1,0 2,0 C 2,0 1.999,-1 1,-1 0,-1 0,0 0,0"/></g><g transform="translate(33,29.999)" id="g90"><path id="path92" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,3.314 -2.686,6.001 -6,6.001 -1.264,0 -2.436,-0.393 -3.402,-1.061 -0.197,0.03 -0.393,0.061 -0.598,0.061 -2.209,0 -4,-1.791 -4,-4 l 0,-6 4.686,0 c 0.949,-0.631 2.087,-1 3.314,-1 1.226,0 2.364,0.369 3.314,1 L 0,-4.999 0,0 Z"/></g><path id="path94" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 25,1 -3,0 0,8 3,0 0,-8 z"/><path id="path96" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 30,1 -3,0 0,8 3,0 0,-8 z"/><path id="path98" style="fill:#f9ca55;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 25,8 -3,0 0,1 3,0 0,-1 z"/><path id="path100" style="fill:#f9ca55;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 30,8 -3,0 0,1 3,0 0,-1 z"/><g transform="translate(21,0)" id="g102"><path id="path104" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,1 C 0,1 0,2 2,2 4,2 4,1 4,1 L 4,0 0,0 Z"/></g><g transform="translate(27,0)" id="g106"><path id="path108" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,1 C 0,1 0,2 2,2 4,2 4,1 4,1 L 4,0 0,0 Z"/></g><g transform="translate(16.999,10)" id="g110"><path id="path112" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.164,0 -0.331,0.04 -0.485,0.126 -0.482,0.269 -0.657,0.877 -0.388,1.359 l 5,9.001 c 0.268,0.482 0.878,0.657 1.359,0.388 0.484,-0.268 0.658,-0.877 0.389,-1.36 l -5,-8.999 C 0.692,0.186 0.352,0 0,0"/></g><g transform="translate(35.001,10)" id="g114"><path id="path116" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.352,0 -0.692,0.186 -0.875,0.515 l -5,8.999 c -0.269,0.483 -0.095,1.092 0.389,1.36 0.482,0.269 1.091,0.094 1.359,-0.388 l 5,-9.001 C 1.142,1.003 0.968,0.395 0.484,0.126 0.331,0.04 0.164,0 0,0"/></g><g transform="translate(32,19)" id="g118"><path id="path120" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,1 c 0,1.105 -0.895,2 -2,2 l -2,0 -4,0 -2,0 c -1.104,0 -2,-0.895 -2,-2 l 0,-1 2,0 0,-4 -2,-6 12,0 -2,6 0,4 2,0 z"/></g><path id="path122" style="fill:#aa8ed6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 30,15 -8,0 0,2 8,0 0,-2 z"/><g transform="translate(24,25)" id="g124"><path id="path126" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-4 c 0,-1.104 0.896,-2 2,-2 1.105,0 2,0.896 2,2 L 4,0 0,0 Z"/></g><g transform="translate(28,25)" id="g128"><path id="path130" style="fill:#f9ca55;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -4,-0.019 -4,-4 c 0,0 2,-1 4,0 l 0,4 z"/></g><g transform="translate(31,33)" id="g132"><path id="path134" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -10,0 0,-6 0,-0.001 c 0,-2.762 2.238,-4.999 5,-4.999 2.762,0 5,2.237 5,4.999 L 0,-6 0,0 Z"/></g><g transform="translate(24,33)" id="g136"><path id="path138" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0,-4 8,-4 L 8,0 0,0 Z"/></g><g transform="translate(24,33)" id="g140"><path id="path142" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0,-4 -4,-4 l 0,4 4,0 z"/></g><g transform="translate(28,24)" id="g144"><path id="path146" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 -2,0 c 0,0 0,-1 2,-1 2,0 2,1 2,1"/></g><g transform="translate(24,27.5)" id="g148"><path id="path150" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 -1,0.276 -0.776,0.5 -0.5,0.5 -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(29,27.5)" id="g152"><path id="path154" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 -1,0.276 -0.776,0.5 -0.5,0.5 -0.224,0.5 0,0.276 0,0"/></g><g transform="translate(25,26)" id="g156"><path id="path158" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1,0 2,0 C 2,0 2,-1 1,-1 0,-1 0,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFAC33" d="M11 0C9.736 0 8.565.393 7.598 1.061 7.401 1.031 7.205 1 7 1 4.791 1 3 2.791 3 5v6c0 3.866 3.134 7 7 7s7-3.134 7-7V6.001C17 2.687 14.314 0 11 0z"/><path fill="#FFDC5D" d="M6 27h3v8H6zm5 0h3v8h-3z"/><path fill="#F9CA55" d="M6 27h3v1H6zm5 0h3v1h-3z"/><path fill="#292F33" d="M5 36v-1s0-1 2-1 2 1 2 1v1H5zm6 0v-1s0-1 2-1 2 1 2 1v1h-4z"/><path fill="#FFDC5D" d="M.999 26c-.164 0-.331-.04-.485-.126-.482-.269-.657-.877-.388-1.359l5-9c.268-.483.876-.657 1.36-.388.482.268.657.877.388 1.36l-5 9c-.183.328-.523.513-.875.513zm18.002 0c-.352 0-.692-.185-.875-.515l-5-9c-.269-.483-.094-1.092.388-1.36.483-.269 1.092-.094 1.36.388l5 9c.269.483.095 1.091-.389 1.359-.153.088-.32.128-.484.128z"/><path fill="#E75A70" d="M4 27h12l-2-6v-4h2v-1c0-1.104-.896-2-2-2H6c-1.104 0-2 .896-2 2v1h2v4l-2 6z"/><path fill="#DA2F47" d="M6 19h8v2H6z"/><path fill="#FFDC5D" d="M8 11v4c0 1.104.896 2 2 2s2-.896 2-2v-4H8z"/><path fill="#F9CA55" d="M12 11l-4 .019V15s2 1 4 0v-4z"/><path fill="#FFDC5D" d="M15 3H5v6c0 2.762 2.238 5 5 5s5-2.237 5-5V3z"/><path fill="#FFAC33" d="M8 3s0 4 8 4V3H8zm0 0s0 4-4 4V3h4z"/><path fill="#DF1F32" d="M12 12H8s0 1 2 1 2-1 2-1z"/><circle fill="#662113" cx="7.5" cy="8.5" r=".5"/><circle fill="#662113" cx="12.5" cy="8.5" r=".5"/><path fill="#C1694F" d="M9 10h2s0 1-1 1-1-1-1-1z"/><path fill="#FFAC33" d="M33 6.001C33 2.687 30.313 0 27 0c-1.264 0-2.435.393-3.402 1.061C23.401 1.031 23.205 1 23 1c-2.209 0-4 1.791-4 4v6h4.685c.949.631 2.088 1 3.315 1 1.226 0 2.364-.369 3.315-1H33V6.001z"/><path fill="#FFDC5D" d="M22 27h3v8h-3zm5 0h3v8h-3z"/><path fill="#F9CA55" d="M22 27h3v1h-3zm5 0h3v1h-3z"/><path fill="#292F33" d="M21 36v-1s0-1 2-1 2 1 2 1v1h-4zm6 0v-1s0-1 2-1 2 1 2 1v1h-4z"/><path fill="#FFDC5D" d="M16.999 26c-.164 0-.331-.04-.485-.126-.483-.269-.657-.877-.388-1.359l5-9c.268-.483.878-.657 1.359-.388.483.268.657.877.389 1.36l-5 9c-.183.328-.523.513-.875.513zm18.002 0c-.352 0-.692-.185-.875-.515l-5-9c-.269-.483-.095-1.092.389-1.36.483-.269 1.092-.094 1.359.388l5 9c.269.483.095 1.091-.389 1.359-.153.088-.32.128-.484.128z"/><path fill="#9268CA" d="M32 17v-1c0-1.104-.896-2-2-2h-8c-1.104 0-2 .896-2 2v1h2v4l-2 6h12l-2-6v-4h2z"/><path fill="#AA8ED6" d="M22 19h8v2h-8z"/><path fill="#FFDC5D" d="M24 11v4c0 1.104.896 2 2 2s2-.896 2-2v-4h-4z"/><path fill="#F9CA55" d="M28 11l-4 .019V15s2 1 4 0v-4z"/><path fill="#FFDC5D" d="M31 3H21v6c0 2.762 2.238 5 5 5s5-2.237 5-5V3z"/><path fill="#FFAC33" d="M24 3s0 4 8 4V3h-8zm0 0s0 4-4 4V3h4z"/><path fill="#DF1F32" d="M28 12h-4s0 1 2 1 2-1 2-1z"/><circle fill="#662113" cx="23.5" cy="8.5" r=".5"/><circle fill="#662113" cx="28.5" cy="8.5" r=".5"/><path fill="#C1694F" d="M25 10h2s0 1-1 1-1-1-1-1z"/></svg> \ No newline at end of file |