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/1f468-1f3fc-200d-1f692.svg b/public/emoji/1f468-1f3fc-200d-1f692.svg
index 4f05f832f..ae7627197 100644
--- a/public/emoji/1f468-1f3fc-200d-1f692.svg
+++ b/public/emoji/1f468-1f3fc-200d-1f692.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,0 36,0 36,36 0,36 0,0 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(32,0)" id="g20"><path id="path22" style="fill:#ce9e5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,2 c 0,3.314 -2.686,6 -6,6 l -16,0 c -3.313,0 -6,-2.686 -6,-6 l 0,-2 28,0 z"/></g><g transform="translate(32,22.3442)" id="g24"><path id="path26" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.59 -6.268,-6.5 -14,-6.5 -7.732,0 -14,2.91 -14,6.5 0,3.59 6.268,2.5 14,2.5 7.732,0 14,1.09 14,-2.5"/></g><g transform="translate(14,9)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 8,0 C 8,0 6.982,-7 4,-7 1.018,-7 0,0 0,0"/></g><g transform="translate(13.6396,7.8994)" id="g32"><path id="path34" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.744,-1.268 2.848,-1.963 4.36,-1.963 1.512,0 2.616,0.696 4.36,1.963 l 0,3.811 L 0,3.811 0,0 Z"/></g><g transform="translate(13.6318,10.0273)" id="g36"><path id="path38" style="fill:#e2c196;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.216,-1.374 2.724,-1.746 4.364,-1.746 1.639,0 3.147,0.373 4.364,1.746 l 0,3.491 L 0,3.491 0,0 Z"/></g><g transform="translate(11.4443,20.0645)" id="g40"><path id="path42" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.734,-2.622 -1.639,-2.622 -0.905,0 -1.639,1.174 -1.639,2.622 0,1.448 0.734,2.623 1.639,2.623 C -0.734,2.623 0,1.448 0,0"/></g><g transform="translate(27.833,20.0645)" id="g44"><path id="path46" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.733,-2.622 -1.639,-2.622 -0.905,0 -1.638,1.174 -1.638,2.622 0,1.448 0.733,2.623 1.638,2.623 C -0.733,2.623 0,1.448 0,0"/></g><g transform="translate(9.4775,19.0405)" id="g48"><path id="path50" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.589 3.816,10.121 8.522,10.121 4.708,0 8.523,-4.532 8.523,-10.121 0,-5.589 -3.815,-10.121 -8.523,-10.121 C 3.816,-10.121 0,-5.589 0,0"/></g><g transform="translate(18,12.1982)" id="g52"><path id="path54" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.754,0 -3.6,0.705 -3.741,0.848 -0.256,0.256 -0.256,0.671 0,0.927 0.248,0.248 0.645,0.254 0.902,0.023 C -2.787,1.761 -2.118,1.311 0,1.311 c 2.2,0 2.836,0.485 2.842,0.49 C 3.098,2.056 3.499,2.044 3.755,1.786 4.011,1.53 3.997,1.104 3.741,0.848 3.6,0.705 2.754,0 0,0"/></g><g transform="translate(18,32.5205)" id="g56"><path id="path58" style="fill:#ffe51e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 5.648,0 9.178,-4.168 9.178,-7.641 0,-3.473 -0.706,-4.863 -1.412,-3.473 -0.706,1.389 -1.412,2.778 -1.412,2.778 0,0 -4.236,0 -5.648,1.39 0,0 2.118,-4.168 -2.118,0 0,0 0.706,-2.779 -3.53,0.694 0,0 -2.118,-1.389 -2.824,-4.862 -0.196,-0.964 -1.412,0 -1.412,3.473 C -9.178,-4.168 -6.354,0 0,0"/></g><g transform="translate(14,19)" id="g60"><path id="path62" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.55,0 -1,0.45 -1,1 l 0,1 C -1,2.55 -0.55,3 0,3 0.55,3 1,2.55 1,2 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(22,19)" id="g64"><path id="path66" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.55,0 -1,0.45 -1,1 l 0,1 C -1,2.55 -0.55,3 0,3 0.55,3 1,2.55 1,2 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(18.75,16.25)" id="g68"><path id="path70" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.5,0 c -0.413,0 -0.75,0.337 -0.75,0.75 0,0.413 0.337,0.75 0.75,0.75 L 0,1.5 C 0.413,1.5 0.75,1.163 0.75,0.75 0.75,0.337 0.413,0 0,0"/></g><g transform="translate(4.0898,3)" id="g72"><path id="path74" style="fill:#fff35f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.055,-0.326 -0.09,-0.659 -0.09,-1 l 0,-2 28,0 0,2 c 0,0.341 -0.035,0.674 -0.09,1 L 0,0 Z"/></g><path id="path76" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 32,1 4,1 4,2 32,2 32,1 Z"/><g transform="translate(27,0)" id="g78"><path id="path80" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,9 c 0,0.55 -0.45,1 -1,1 l -1,0 C -2.55,10 -3,9.55 -3,9 l 0,-9 3,0 z"/></g><g transform="translate(12,0)" id="g82"><path id="path84" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,9 c 0,0.55 -0.45,1 -1,1 l -1,0 C -2.55,10 -3,9.55 -3,9 l 0,-9 3,0 z"/></g><g transform="translate(28.8525,25.1431)" id="g86"><path id="path88" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.859,0.173 -1.093,4.028 -3.084,6.859 -1.874,2.663 -5.465,3.998 -7.772,3.998 -2.307,0 -5.897,-1.335 -7.771,-3.998 -1.992,-2.831 -2.224,-6.686 -3.085,-6.859 -3.316,-0.665 -3.161,-2.386 -3.14,-2.782 0.124,0.466 0.438,1.578 3.902,1.639 3.404,0.061 6.58,-0.805 10.094,-0.805 3.515,0 6.69,0.866 10.094,0.805 3.464,-0.061 3.78,-1.173 3.903,-1.639 C 3.161,-2.385 3.317,-0.665 0,0"/></g><g transform="translate(18,36)" id="g90"><path id="path92" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.094,0 5,-3.593 5,-5.054 L 5,-9 c 0,0 -0.109,-1 -0.92,-1 L 0,-10 0,0 Z"/></g><g transform="translate(18,36)" id="g94"><path id="path96" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.094,0 -5,-3.593 -5,-5.054 L -5,-9 c 0,0 0.109,-1 0.92,-1 L 0,-10 0,0 Z"/></g><path id="path98" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 19,2 -2,0 0,2 2,0 0,-2 z"/><g transform="translate(18.0215,2)" id="g100"><path id="path102" style="fill:#ce9e5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.021,-2 -6,0 0,7 c 0,0 -0.016,1.463 0,2 0.015,0.537 -0.406,1.622 0,2 0.406,0.378 2.454,-0.364 3,-1 0.544,-0.636 0.627,-1.737 1,-3 C -1.649,3.737 0,0 0,0"/></g><g transform="translate(17.8228,2)" id="g104"><path id="path106" style="fill:#ce9e5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.021,-2 6.156,0 0,7 c 0,0 0.015,1.463 0,2 C 6.163,7.537 6.466,8.622 6.06,9 5.654,9.378 3.586,8.636 3.042,8 2.495,7.364 2.403,6.263 2.031,5 1.659,3.737 0,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CE9E5D" d="M32 36v-2c0-3.313-2.687-6-6-6H10c-3.313 0-6 2.687-6 6v2h28z"/><path fill="#FFF35F" d="M4.09 33c-.055.326-.09.659-.09 1v2h28v-2c0-.341-.035-.674-.09-1H4.09z"/><path fill="#CCD6DD" d="M4 34h28v1H4z"/><path fill="#A0041E" d="M32 13.656c0 3.59-6.268 6.5-14 6.5s-14-2.91-14-6.5 6.268-2.5 14-2.5 14-1.09 14 2.5z"/><path fill="#292F33" d="M14 27h8s-1.018 7-4 7-4-7-4-7z"/><path fill="#F3D2A2" d="M13.64 28.101c1.744 1.267 2.848 1.962 4.36 1.962 1.511 0 2.616-.696 4.36-1.962V24.29h-8.72v3.811z"/><path fill="#E2C196" d="M13.632 25.973c1.216 1.374 2.724 1.746 4.364 1.746 1.639 0 3.147-.372 4.364-1.746v-3.491h-8.728v3.491z"/><path fill="#F3D2A2" d="M11.444 15.935c0 1.448-.734 2.622-1.639 2.622s-1.639-1.174-1.639-2.622.734-2.623 1.639-2.623c.906.001 1.639 1.175 1.639 2.623zm16.389 0c0 1.448-.734 2.622-1.639 2.622s-1.639-1.174-1.639-2.622.734-2.623 1.639-2.623c.906.001 1.639 1.175 1.639 2.623z"/><path fill="#F3D2A2" d="M9.478 16.96c0-5.589 3.816-10.121 8.522-10.121s8.522 4.531 8.522 10.121c0 5.589-3.816 10.12-8.522 10.12s-8.522-4.531-8.522-10.12z"/><path fill="#C1694F" d="M18 23.802c-2.754 0-3.6-.706-3.741-.848-.256-.256-.256-.671 0-.927.248-.248.645-.255.902-.024.052.038.721.487 2.839.487 2.2 0 2.836-.485 2.842-.49.255-.255.656-.243.913.013.256.256.242.684-.014.94-.141.143-.987.849-3.741.849z"/><path fill="#FFE51E" d="M18 3.479c5.648 0 9.178 4.168 9.178 7.641s-.706 4.863-1.412 3.473l-1.412-2.778s-4.236 0-5.648-1.39c0 0 2.118 4.168-2.118 0 0 0 .706 2.779-3.53-.695 0 0-2.118 1.39-2.824 4.863-.196.963-1.412 0-1.412-3.473S11.646 3.479 18 3.479z"/><path fill="#662113" d="M14 17c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1zm8 0c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1z"/><path fill="#C1694F" d="M18.75 19.75h-1.5c-.413 0-.75-.337-.75-.75s.337-.75.75-.75h1.5c.413 0 .75.337.75.75s-.337.75-.75.75z"/><path fill="#292F33" d="M27 36v-9c0-.55-.45-1-1-1h-1c-.55 0-1 .45-1 1v9h3zm-15 0v-9c0-.55-.45-1-1-1h-1c-.55 0-1 .45-1 1v9h3z"/><path fill="#DF1F32" d="M28.853 10.857c-.86-.173-1.093-4.028-3.084-6.859C23.894 1.335 20.304 0 17.997 0S12.1 1.335 10.226 3.998c-1.992 2.831-2.224 6.686-3.084 6.859-3.317.665-3.161 2.386-3.14 2.782.123-.466.438-1.578 3.902-1.64 3.404-.06 6.58.806 10.094.806s6.69-.866 10.094-.806c3.464.061 3.778 1.173 3.902 1.64.02-.396.176-2.117-3.141-2.782z"/><path fill="#EA596E" d="M18 0c-2.094 0-5 3.593-5 5.054V9s.109 1 .92 1h8.16c.811 0 .92-1 .92-1V5.054C23 3.593 20.094 0 18 0z"/><path fill="#CE9E5D" d="M23.883 25c-.406-.378-2.474.364-3.019 1-.545.636-.638 1.737-1.01 3-.318 1.079-1.572 3.958-1.931 4.775-.358-.817-1.605-3.696-1.923-4.775-.372-1.263-.455-2.364-1-3s-2.594-1.378-3-1 .015 1.463 0 2 0 9 0 9h12s.015-8.463 0-9 .289-1.622-.117-2z"/></svg>
\ No newline at end of file