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.

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f6ec.svg b/public/emoji/1f6ec.svg
index 0493a97eb..ee10becd3 100644
--- a/public/emoji/1f6ec.svg
+++ b/public/emoji/1f6ec.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><clipPath id="clipPath60" clipPathUnits="userSpaceOnUse"><path id="path62" d="m 3.422,28.111 c -0.395,-1.89 6.234,-4.874 8.126,-5.268 l 0,0 17.102,-3.565 c 1.891,-0.394 6.58,-0.281 6.975,1.611 l 0,0 c 0.395,1.893 -3.655,4.847 -5.547,5.242 l 0,0 -19.09,3.978 C 10.557,30.199 9.952,30.25 9.27,30.25 l 0,0 c -2.316,0 -5.524,-0.578 -5.848,-2.139"/></clipPath><clipPath id="clipPath72" clipPathUnits="userSpaceOnUse"><path id="path74" 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"><path id="path12" style="fill:#5d9040;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 36,0 36,13 0,13 0,0 Z"/><path id="path14" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,5 36,0 0,5.999 -36,0 L 0,5 Z"/><g id="g16"><g clip-path="url(#clipPath20)" id="g18"><g transform="translate(10,8)" id="g24"><path id="path26" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.448,-1 -1,-1 l -6,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 l 6,0 C -0.448,1 0,0.553 0,0"/></g><g transform="translate(22,8)" id="g28"><path id="path30" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -6,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 l 6,0 C -0.447,1 0,0.553 0,0"/></g><g transform="translate(34,8)" id="g32"><path id="path34" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -6,0 c -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 l 6,0 C -0.447,1 0,0.553 0,0"/></g><g transform="translate(18.8389,18.7695)" id="g36"><path id="path38" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.169,-0.811 -0.963,-1.331 -1.774,-1.163 -0.811,0.169 -1.331,0.964 -1.163,1.775 0.169,0.811 0.964,1.331 1.775,1.162 C -0.352,1.605 0.169,0.811 0,0"/></g><g transform="translate(28.9355,18.1987)" id="g40"><path id="path42" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.169,-0.811 -0.964,-1.331 -1.775,-1.163 -0.811,0.169 -1.331,0.964 -1.163,1.775 0.17,0.811 0.964,1.331 1.775,1.162 C -0.352,1.605 0.169,0.811 0,0"/></g><g transform="translate(28.1602,19.3818)" id="g44"><path id="path46" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.057,-0.271 -0.321,-0.444 -0.592,-0.388 -0.27,0.057 -0.443,0.322 -0.387,0.592 L -0.57,2.162 C -0.515,2.433 -0.25,2.606 0.02,2.549 0.291,2.493 0.465,2.229 0.408,1.958 L 0,0 Z"/></g><g transform="translate(17.0859,25.0254)" id="g48"><path id="path50" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.502,-1.42 7.703,-2.376 6.104,-0.246 1.505,6.788 -3.878,9.115 -2.938,6.897 -1.877,4.4 -1.227,2.604 0,0"/></g><g transform="translate(35.625,20.8887)" id="g52"><path id="path54" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.395,-1.892 -5.084,-2.005 -6.976,-1.61 l -17.101,3.564 c -1.892,0.395 -8.521,3.377 -8.127,5.269 0.421,2.021 5.675,2.393 7.567,1.998 L -5.547,5.242 C -3.655,4.848 0.395,1.893 0,0"/></g></g></g><g id="g56"><g clip-path="url(#clipPath60)" id="g58"><g transform="translate(31.2168,24.4731)" id="g64"><path id="path66" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.582,0.154 1.462,0.046 1.965,0.468 2.468,0.89 3.902,-0.334 3.366,-0.765 2.829,-1.196 1.5,-1.686 0.207,-1.607 -1.085,-1.53 -0.676,-0.178 0,0"/></g></g></g><g id="g68"><g clip-path="url(#clipPath72)" id="g70"><g transform="translate(3.502,28.5005)" id="g76"><path id="path78" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.171,0.82 1.224,5.87 1.395,6.689 1.907,9.148 4.369,4.549 5.496,1.749 3.491,1.634 1.532,1.426 0,0"/></g><g transform="translate(28.9766,23.2959)" id="g80"><path id="path82" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.113,-0.54 -0.643,-0.888 -1.184,-0.775 -0.541,0.113 -0.887,0.643 -0.774,1.183 0.112,0.541 0.642,0.888 1.183,0.775 C -0.234,1.07 0.112,0.541 0,0"/></g><g transform="translate(26.0391,23.9082)" id="g84"><path id="path86" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.112,-0.54 -0.642,-0.888 -1.183,-0.775 -0.541,0.113 -0.887,0.643 -0.775,1.183 0.113,0.541 0.642,0.888 1.183,0.775 C -0.233,1.07 0.113,0.54 0,0"/></g><g transform="translate(23.1025,24.5205)" id="g88"><path id="path90" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.113,-0.541 -0.642,-0.888 -1.184,-0.775 -0.541,0.113 -0.886,0.643 -0.774,1.183 0.112,0.541 0.642,0.888 1.183,0.775 C -0.234,1.07 0.112,0.54 0,0"/></g><g transform="translate(20.166,25.1328)" id="g92"><path id="path94" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.113,-0.541 -0.643,-0.888 -1.184,-0.775 -0.541,0.113 -0.887,0.642 -0.774,1.183 0.112,0.541 0.642,0.887 1.183,0.775 C -0.234,1.07 0.112,0.54 0,0"/></g><g transform="translate(17.2285,25.7446)" id="g96"><path id="path98" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.113,-0.54 -0.642,-0.888 -1.183,-0.775 -0.541,0.113 -0.887,0.643 -0.775,1.183 0.113,0.541 0.642,0.888 1.183,0.775 C -0.234,1.07 0.113,0.541 0,0"/></g><g transform="translate(14.292,26.3569)" id="g100"><path id="path102" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.113,-0.54 -0.642,-0.888 -1.183,-0.775 -0.541,0.113 -0.888,0.643 -0.775,1.183 0.113,0.541 0.642,0.888 1.183,0.775 C -0.234,1.07 0.112,0.541 0,0"/></g><g transform="translate(4.186,27.9526)" id="g104"><path id="path106" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.105,0.339 4.232,-0.372 1.787,-1.905 -1.762,-4.23 -3.97,-3.704 -3.088,-2.868 -2.093,-1.926 -1.093,-0.954 0,0"/></g><g transform="translate(15.667,23.6123)" id="g108"><path id="path110" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.026,1.095 8.016,-0.905 5.7,-2.21 -1.331,-6.815 -7.195,-6.799 -5.447,-5.141 -3.477,-3.275 -2.164,-1.888 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#5D9040" d="M36 23v13H0V23h36z"/><path fill="#CCD6DD" d="M0 25h36v6H0z"/><path fill="#F5F8FA" d="M10 28c0 .553-.448 1-1 1H3c-.552 0-1-.447-1-1 0-.553.448-1 1-1h6c.552 0 1 .447 1 1zm12 0c0 .553-.447 1-1 1h-6c-.552 0-1-.447-1-1 0-.553.448-1 1-1h6c.553 0 1 .447 1 1zm12 0c0 .553-.447 1-1 1h-6c-.553 0-1-.447-1-1 0-.553.447-1 1-1h6c.553 0 1 .447 1 1z"/><circle fill="#67757F" cx="17.345" cy="17.015" r="1.5"/><circle fill="#67757F" cx="27.442" cy="17.567" r="1.5"/><path fill="#5DADEC" d="M17.049 11.065c.505 1.419 7.708 2.361 6.105.235-4.613-7.025-10-9.342-9.055-7.126 1.065 2.495 1.718 4.29 2.95 6.891z"/><path fill="#CCD6DD" d="M35.596 15.167c-.391 1.892-5.08 2.014-6.973 1.624l-17.108-3.532c-1.893-.391-8.528-3.361-8.137-5.254.417-2.021 5.67-2.403 7.563-2.012l19.097 3.943c1.894.39 5.949 3.338 5.558 5.231z"/><path fill="#67757F" d="M32.791 11.306c-.5.192-1.146.162-1.61.285-.675.179-1.082 1.532.21 1.607 1.107.065 2.236-.287 2.875-.66-.44-.44-.948-.86-1.475-1.232z"/><path fill="#5DADEC" d="M3.504 7.65C3.673 6.83 4.671 1.744 4.84.924c.508-2.46 2.979 2.134 4.111 4.933-2.005.119-3.918.365-5.447 1.793zm.64.513c1.105-.341 4.233.364 1.791 1.901-3.544 2.332-5.754 1.81-4.873.972.992-.944 1.991-1.918 3.082-2.873zm11.489 4.318c1.024-1.097 8.017.89 5.704 2.199-7.023 4.619-12.887 4.614-11.141 2.953 1.966-1.87 3.277-3.26 5.437-5.152z"/><circle fill="#9AAAB4" cx="27.964" cy="12.57" r="1"/><circle fill="#9AAAB4" cx="25.025" cy="11.963" r="1"/><circle fill="#9AAAB4" cx="22.087" cy="11.357" r="1"/><circle fill="#9AAAB4" cx="19.149" cy="10.75" r="1"/><circle fill="#9AAAB4" cx="16.211" cy="10.144" r="1"/><circle fill="#9AAAB4" cx="13.274" cy="9.537" r="1"/></svg>
\ No newline at end of file