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/1f1f8-1f1f0.svg b/public/emoji/1f1f8-1f1f0.svg
index d3a88c1da..c4f7cafdf 100644
--- a/public/emoji/1f1f8-1f1f0.svg
+++ b/public/emoji/1f1f8-1f1f0.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><clipPath id="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="M 4,31 C 1.791,31 0,29.209 0,27 L 0,27 0,9 C 0,6.791 1.791,5 4,5 l 0,0 28,0 c 2.209,0 4,1.791 4,4 l 0,0 0,18 c 0,2.209 -1.791,4 -4,4 l 0,0 -28,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(36,9)" id="g20"><path id="path22" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -28,0 c -2.209,0 -4,1.791 -4,4 l 0,18 c 0,2.209 1.791,4 4,4 l 28,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><path id="path32" style="fill:#0a4ea2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 36,13 0,13 0,23 36,23 36,13 Z"/><path id="path34" style="fill:#ee2024;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 36,5 0,5 0,13 36,13 36,5 Z"/><g transform="translate(11.8374,10.9102)" id="g36"><path id="path38" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.129,0.645 -3.638,2.278 -4.555,4.488 -0.925,2.227 -0.719,5.424 -0.482,9.124 l 0.06,0.936 11.963,0 0.061,-0.935 C 7.285,9.913 7.491,6.718 6.566,4.489 5.648,2.278 3.14,0.645 2.011,0 L 1.007,-0.572 0,0 Z"/></g><g transform="translate(17.8862,24.4585)" id="g40"><path id="path42" style="fill:#ee2024;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5.038,0 -0.011,0 -5.038,0 c -0.239,-3.706 -0.422,-6.68 0.407,-8.676 1.021,-2.46 4.516,-4.22 4.631,-4.277 l 0,-0.005 0.006,0.002 0.005,-0.002 0,0.005 c 0.115,0.057 3.61,1.817 4.632,4.277 C 0.422,-6.68 0.239,-3.706 0,0"/></g><g transform="translate(13.4688,15.1973)" id="g44"><path id="path46" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.247 -0.2,-0.447 -0.447,-0.447 l -0.606,0 c -0.247,0 -0.447,0.2 -0.447,0.447 0,0 0.281,4.053 0.281,5.178 0,1.125 -0.281,3.146 -0.281,3.146 0,0.247 0.2,0.447 0.447,0.447 l 0.606,0 C -0.2,8.771 0,8.571 0,8.324 0,8.324 -0.25,6.429 -0.25,5.209 -0.25,3.99 0,0 0,0"/></g><g transform="translate(10.5566,20.7656)" id="g48"><path id="path50" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.247,0 -0.447,0.2 -0.447,0.447 l 0,0.606 C -0.447,1.3 -0.247,1.5 0,1.5 0,1.5 1.048,1.297 2.1,1.297 3.151,1.297 4.324,1.5 4.324,1.5 4.571,1.5 4.771,1.3 4.771,1.053 l 0,-0.606 C 4.771,0.2 4.571,0 4.324,0 4.324,0 3.38,0.266 2.099,0.266 0.818,0.266 0,0 0,0"/></g><g transform="translate(9.541,18.3906)" id="g52"><path id="path54" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.247,0 -0.447,0.2 -0.447,0.447 l 0,0.606 C -0.447,1.3 -0.247,1.5 0,1.5 0,1.5 1.896,1.328 3.209,1.328 4.521,1.328 6.324,1.5 6.324,1.5 6.571,1.5 6.771,1.3 6.771,1.053 l 0,-0.606 C 6.771,0.2 6.571,0 6.324,0 6.324,0 4.482,0.133 3.045,0.133 1.608,0.133 0,0 0,0"/></g><g transform="translate(17.0791,15.0352)" id="g56"><path id="path58" style="fill:#0a4ea2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.508,1.086 -1.905,1.393 -2.568,0.066 -3.006,1.66 -4.249,1.66 -4.249,1.66 c 0,0 -1.244,0 -1.682,-1.594 -0.658,1.317 -2.04,1.025 -2.557,-0.041 1.314,-2.074 4.143,-3.504 4.246,-3.554 l 0,-0.006 0.006,0.003 0.005,-0.003 0,0.006 C -4.128,-3.479 -1.321,-2.061 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#EE2024" d="M36 27v-4H0v4c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4z"/><path fill="#EEE" d="M36 23H0V9c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v14z"/><path fill="#0A4EA2" d="M0 13h36v10H0z"/><path fill="#FFF" d="M11.837 25.09c-1.129-.646-3.638-2.278-4.555-4.488-.925-2.227-.719-5.423-.481-9.124l.06-.936h11.963l.061.936c.238 3.7.444 6.895-.481 9.123-.918 2.211-3.426 3.844-4.556 4.489l-1.004.572-1.007-.572z"/><path fill="#EE2024" d="M17.886 11.542H7.798c-.238 3.707-.422 6.68.407 8.676 1.021 2.46 4.516 4.22 4.631 4.276v.006l.005-.003.005.003v-.006c.115-.057 3.61-1.816 4.632-4.276.83-1.996.647-4.97.408-8.676z"/><path fill="#FFF" d="M15.865 16.109s-1.401.133-2.632.165c-.009-.269-.014-.506-.014-.681 0-.188.007-.394.017-.605.973.06 1.645.246 1.645.246.247 0 .447-.2.447-.447v-.606c0-.247-.2-.447-.447-.447 0 0-.739.126-1.568.179.071-.782.156-1.435.156-1.435 0-.247-.2-.447-.447-.447h-.605c-.247 0-.447.2-.447.447 0 0 .092.666.17 1.443-.852-.047-1.583-.187-1.583-.187-.247 0-.447.2-.447.447v.606c0 .247.2.447.447.447 0 0 .639-.206 1.67-.255.014.23.024.453.024.646 0 .161-.006.388-.016.649-1.242-.033-2.693-.164-2.693-.164-.247 0-.447.2-.447.447v.606c0 .247.2.447.447.447 0 0 1.319-.108 2.635-.128-.083 1.531-.207 3.322-.207 3.322 0 .247.2.447.447.447h.605c.247 0 .447-.2.447-.447 0 0-.111-1.773-.185-3.317 1.272.03 2.581.123 2.581.123.247 0 .447-.2.447-.447v-.606c0-.247-.2-.448-.447-.448z"/><path fill="#0A4EA2" d="M17.079 20.965c-.508-1.086-1.905-1.393-2.568-.066-.438-1.594-1.681-1.594-1.681-1.594s-1.244 0-1.681 1.594c-.658-1.316-2.04-1.024-2.558.041 1.314 2.074 4.143 3.504 4.247 3.555v.005l.005-.003.005.003v-.006c.103-.051 2.91-1.469 4.231-3.529z"/></svg>
\ No newline at end of file