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/1f46c.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/1f46c.svg')
-rw-r--r-- | public/emoji/1f46c.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f46c.svg b/public/emoji/1f46c.svg index 7feab42c0..f61d4c434 100644 --- a/public/emoji/1f46c.svg +++ b/public/emoji/1f46c.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="clipPath20" clipPathUnits="userSpaceOnUse"><path id="path22" 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(11,13)" id="g12"><path id="path14" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 -3,0 0,-12 3,0 0,8 2,0 0,-8 3,0 0,12 -3,0 z"/></g><g id="g16"><g clip-path="url(#clipPath20)" id="g18"><g transform="translate(5,0)" id="g24"><path id="path26" 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="g28"><path id="path30" 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="g32"><path id="path34" 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="g36"><path id="path38" 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(16,20)" id="g40"><path id="path42" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 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,-7 8,0 0,7 2,0 0,1 z"/></g><g transform="translate(8,25)" id="g44"><path id="path46" 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="g48"><path id="path50" 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,29)" id="g52"><path id="path54" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -6.221,0 -6.996,2.412 -7.035,3.488 -7.15,2.412 -7.667,0 -10,0 l 0,-1.076 0,-0.924 0,-10e-4 C -10,-4.763 -7.762,-7 -5,-7 c 2.762,0 5,2.237 5,4.999 L 0,-2 0,-1.656 0,0 Z"/></g><g transform="translate(7.9648,32.4878)" id="g56"><path id="path58" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.039,-1.076 0.814,-3.488 7.035,-3.488 l 0,-1.656 c 0.628,0.893 1,1.98 1,3.155 0,3.038 -2.463,5.501 -5.5,5.501 -1.186,0 -2.282,-0.379 -3.181,-1.018 -1.846,-0.096 -3.319,-1.611 -3.319,-3.482 0,-1.209 0.02,-2.655 1,-3.576 l 0,1.076 c 2.333,0 2.85,2.412 2.965,3.488"/></g><g transform="translate(12,24)" id="g60"><path id="path62" style="fill:#c1694f;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="g64"><path id="path66" 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="g68"><path id="path70" 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="g72"><path id="path74" 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 transform="translate(27,13)" id="g76"><path id="path78" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 -3,0 0,-12 3,0 0,8 2,0 0,-8 3,0 0,12 -3,0 z"/></g><g transform="translate(21,0)" id="g80"><path id="path82" 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="g84"><path id="path86" 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="g88"><path id="path90" 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="g92"><path id="path94" 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,20)" id="g96"><path id="path98" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 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,-7 8,0 0,7 2,0 0,1 z"/></g><g transform="translate(24,25)" id="g100"><path id="path102" 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="g104"><path id="path106" 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(32,31.5)" id="g108"><path id="path110" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.871 -1.473,3.386 -3.319,3.482 -4.218,4.121 -5.313,4.5 -6.5,4.5 -9.537,4.5 -12,2.037 -12,-1.001 c 0,-1.175 0.372,-2.262 1,-3.155 l 0,1.656 c 6.221,0 6.996,2.412 7.035,3.488 C -3.85,-0.088 -3.333,-2.5 -1,-2.5 l 0,-1.076 C -0.019,-2.655 0,-1.209 0,0"/></g><g transform="translate(28.0352,32.4878)" id="g112"><path id="path114" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.039,-1.076 -0.814,-3.488 -7.035,-3.488 l 0,-1.656 0,-0.344 0,0 c 0,-2.763 2.238,-5 5,-5 2.762,0 5,2.237 5,5 l 0,0 0,0.924 0,1.076 C 0.632,-3.488 0.115,-1.076 0,0"/></g><g transform="translate(28,24)" id="g116"><path id="path118" style="fill:#c1694f;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="g120"><path id="path122" 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="g124"><path id="path126" 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="g128"><path id="path130" 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="#AAB8C2" d="M11 23H6v12h3v-8h2v8h3V23z"/><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="#4289C1" d="M16 16c0-1.104-.896-2-2-2H6c-1.104 0-2 .896-2 2v1h2v7h8v-7h2v-1z"/><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 7C8.779 7 8.004 4.588 7.965 3.512 7.85 4.588 7.333 7 5 7v2c0 2.762 2.238 5 5 5s5-2.237 5-5V7z"/><path fill="#FFAC33" d="M7.965 3.512C8.004 4.588 8.779 7 15 7v1.656c.628-.894 1-1.98 1-3.155C16 2.463 13.537 0 10.5 0 9.314 0 8.218.379 7.319 1.018 5.473 1.114 4 2.629 4 4.5c0 1.209.019 2.655 1 3.576V7c2.333 0 2.85-2.412 2.965-3.488z"/><path fill="#C1694F" 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="#67757F" d="M27 23h-5v12h3v-8h2v8h3V23z"/><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="#77B255" d="M32 16c0-1.104-.896-2-2-2h-8c-1.104 0-2 .896-2 2v1h2v7h8v-7h2v-1z"/><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="#FFAC33" d="M32 4.5c0-1.871-1.473-3.386-3.319-3.482C27.782.379 26.687 0 25.5 0 22.463 0 20 2.463 20 5.501c0 1.175.372 2.262 1 3.155V7c6.221 0 6.996-2.412 7.035-3.488C28.15 4.588 28.667 7 31 7v1.076c.981-.921 1-2.367 1-3.576z"/><path fill="#FFDC5D" d="M28.035 3.512C27.996 4.588 27.221 7 21 7v2c0 2.762 2.238 5 5 5s5-2.237 5-5V7c-2.333 0-2.85-2.412-2.965-3.488z"/><path fill="#C1694F" 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 |