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/1f5d2.svg b/public/emoji/1f5d2.svg
index 61e735eb9..cbb6965bc 100644
--- a/public/emoji/1f5d2.svg
+++ b/public/emoji/1f5d2.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="clipPath18" clipPathUnits="userSpaceOnUse"><path id="path20" 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:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 27.814,29.609 1.996,0 0,2.391 -1.996,0 0,-2.391 z"/><g id="g14"><g clip-path="url(#clipPath18)" id="g16"><g transform="translate(29,32)" id="g22"><path id="path24" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -20,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-24 c 0,-2.209 1.791,-4 4,-4 l 20,0 c 2.209,0 4,1.791 4,4 L 4,-4 C 4,-1.791 2.209,0 0,0"/></g><g transform="translate(27,32)" id="g26"><path id="path28" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -20,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-24 c 0,-2.209 1.791,-4 4,-4 l 20,0 c 2.209,0 4,1.791 4,4 L 4,-4 C 4,-1.791 2.209,0 0,0"/></g><g transform="translate(28,21)" id="g30"><path id="path32" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -20,0 c -0.552,0 -1,0.447 -1,1 0,0.552 0.448,1 1,1 L -1,1 C -0.447,1 0,0.552 0,0"/></g><g transform="translate(28,16)" id="g34"><path id="path36" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -20,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L -1,1 C -0.447,1 0,0.553 0,0"/></g><g transform="translate(28,11)" id="g38"><path id="path40" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -20,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L -1,1 C -0.447,1 0,0.553 0,0"/></g><g transform="translate(20,6)" id="g42"><path id="path44" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -12,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L -1,1 C -0.447,1 0,0.553 0,0"/></g><g transform="translate(7.8359,27.2695)" id="g46"><path id="path48" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.702,0 -1.271,0.666 -1.271,1.489 0,0.823 0.569,1.49 1.271,1.49 0.701,0 1.27,-0.667 1.27,-1.49 C 1.27,0.666 0.701,0 0,0"/></g><g transform="translate(8.543,28.917)" id="g50"><path id="path52" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.055,0.479 -0.374,0.792 -0.729,1.017 -0.485,0.306 -1,1.007 -1,1.876 0,1.105 0.671,2.095 1.5,2.095 0.83,0 1.501,-0.905 1.501,-1.905 l 1.996,0 c -0.021,2 -1.576,3.821 -3.497,3.821 -1.933,0 -3.5,-1.819 -3.5,-4.005 0,-1.853 1.045,-3.371 2.57,-3.925 C -0.4,-1.302 0.064,-0.579 0,0"/></g><g transform="translate(13.8359,27.2695)" id="g54"><path id="path56" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.702,0 -1.271,0.666 -1.271,1.489 0,0.823 0.569,1.49 1.271,1.49 0.701,0 1.27,-0.667 1.27,-1.49 C 1.27,0.666 0.701,0 0,0"/></g><g transform="translate(14.543,28.917)" id="g58"><path id="path60" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.055,0.479 -0.374,0.792 -0.729,1.017 -0.485,0.306 -1,1.007 -1,1.876 0,1.105 0.671,2.095 1.5,2.095 0.83,0 1.5,-0.905 1.5,-1.905 l 1.997,0 c -0.021,2 -1.576,3.821 -3.497,3.821 -1.933,0 -3.5,-1.819 -3.5,-4.005 0,-1.853 1.045,-3.371 2.57,-3.925 C -0.4,-1.302 0.064,-0.579 0,0"/></g><g transform="translate(19.8359,27.2695)" id="g62"><path id="path64" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.702,0 -1.271,0.666 -1.271,1.489 0,0.823 0.569,1.49 1.271,1.49 0.701,0 1.27,-0.667 1.27,-1.49 C 1.27,0.666 0.701,0 0,0"/></g><g transform="translate(20.543,28.917)" id="g66"><path id="path68" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.055,0.479 -0.374,0.792 -0.729,1.017 -0.485,0.306 -1,1.007 -1,1.876 0,1.105 0.671,2.095 1.5,2.095 0.83,0 1.5,-0.905 1.5,-1.905 l 1.997,0 c -0.021,2 -1.576,3.821 -3.497,3.821 -1.933,0 -3.5,-1.819 -3.5,-4.005 0,-1.853 1.045,-3.371 2.57,-3.925 C -0.4,-1.302 0.064,-0.579 0,0"/></g><g transform="translate(25.8359,27.2695)" id="g70"><path id="path72" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.702,0 -1.271,0.666 -1.271,1.489 0,0.823 0.569,1.49 1.271,1.49 0.701,0 1.27,-0.667 1.27,-1.49 C 1.27,0.666 0.701,0 0,0"/></g><g transform="translate(26.543,28.917)" id="g74"><path id="path76" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.055,0.479 -0.374,0.792 -0.729,1.017 -0.485,0.306 -1,1.007 -1,1.876 0,1.105 0.671,2.095 1.5,2.095 0.83,0 1.5,-0.905 1.5,-1.905 l 1.997,0 c -0.021,2 -1.576,3.821 -3.497,3.821 -1.933,0 -3.5,-1.819 -3.5,-4.005 0,-1.853 1.045,-3.371 2.57,-3.925 C -0.4,-1.302 0.064,-0.579 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#66757F" d="M27.815 4h1.996v2.391h-1.996z"/><path fill="#55ACEE" d="M29 4H9C6.791 4 5 5.791 5 8v24c0 2.209 1.791 4 4 4h20c2.209 0 4-1.791 4-4V8c0-2.209-1.791-4-4-4z"/><path fill="#CCD6DD" d="M27 4H7C4.791 4 3 5.791 3 8v24c0 2.209 1.791 4 4 4h20c2.209 0 4-1.791 4-4V8c0-2.209-1.791-4-4-4z"/><path fill="#99AAB5" d="M28 15c0 .553-.447 1-1 1H7c-.552 0-1-.447-1-1 0-.552.448-1 1-1h20c.553 0 1 .448 1 1zm0 5c0 .553-.447 1-1 1H7c-.552 0-1-.447-1-1 0-.553.448-1 1-1h20c.553 0 1 .447 1 1zm0 5c0 .553-.447 1-1 1H7c-.552 0-1-.447-1-1 0-.553.448-1 1-1h20c.553 0 1 .447 1 1zm-8 5c0 .553-.447 1-1 1H7c-.552 0-1-.447-1-1 0-.553.448-1 1-1h12c.553 0 1 .447 1 1z"/><path fill="#292F33" d="M7.836 8.731c-.702 0-1.271-.666-1.271-1.489 0-.822.569-1.489 1.271-1.489.701 0 1.27.667 1.27 1.489 0 .822-.569 1.489-1.27 1.489z"/><path fill="#66757F" d="M8.543 7.083c-.055-.48-.374-.792-.729-1.017-.485-.307-1-1.008-1-1.877 0-1.104.671-2.095 1.5-2.095s1.5.905 1.5 1.905h1.996c-.021-2-1.575-3.821-3.496-3.821-1.934 0-3.5 1.819-3.5 4.005 0 1.853 1.045 3.371 2.569 3.926.76.276 1.224-.447 1.16-1.026z"/><path fill="#292F33" d="M13.836 8.731c-.702 0-1.271-.666-1.271-1.489 0-.822.569-1.489 1.271-1.489.701 0 1.27.667 1.27 1.489 0 .822-.569 1.489-1.27 1.489z"/><path fill="#66757F" d="M14.543 7.083c-.055-.48-.374-.792-.729-1.017-.485-.307-1-1.008-1-1.877 0-1.104.671-2.095 1.5-2.095s1.5.905 1.5 1.905h1.996c-.02-2-1.575-3.821-3.496-3.821-1.934 0-3.5 1.819-3.5 4.005 0 1.853 1.045 3.371 2.569 3.926.76.276 1.224-.447 1.16-1.026z"/><path fill="#292F33" d="M19.836 8.731c-.702 0-1.271-.666-1.271-1.489 0-.822.569-1.489 1.271-1.489.701 0 1.271.667 1.271 1.489-.001.822-.57 1.489-1.271 1.489z"/><path fill="#66757F" d="M20.543 7.083c-.055-.48-.374-.792-.728-1.017-.485-.307-1-1.008-1-1.877 0-1.104.671-2.095 1.5-2.095s1.5.905 1.5 1.905h1.996c-.02-2-1.575-3.821-3.496-3.821-1.934 0-3.5 1.819-3.5 4.005 0 1.853 1.045 3.371 2.569 3.926.759.276 1.223-.447 1.159-1.026z"/><path fill="#292F33" d="M25.836 8.731c-.702 0-1.271-.666-1.271-1.489 0-.822.569-1.489 1.271-1.489.701 0 1.271.667 1.271 1.489-.001.822-.57 1.489-1.271 1.489z"/><path fill="#66757F" d="M26.543 7.083c-.055-.48-.374-.792-.728-1.017-.485-.307-1-1.008-1-1.877 0-1.104.671-2.095 1.5-2.095s1.5.905 1.5 1.905h1.996c-.02-2-1.575-3.821-3.496-3.821-1.934 0-3.5 1.819-3.5 4.005 0 1.853 1.045 3.371 2.569 3.926.759.276 1.223-.447 1.159-1.026z"/></svg>
\ No newline at end of file