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/1f4b0.svg b/public/emoji/1f4b0.svg
index a23258732..5b41c52d4 100644
--- a/public/emoji/1f4b0.svg
+++ b/public/emoji/1f4b0.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></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(31.8984,12.0615)" id="g20"><path id="path22" style="fill:#fdd888;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.599,6.618 -3.898,9.939 -3.898,9.939 l -6,8 -1,0 -3,0 -3,0 -1,0 -6,-8 c 0,0 -1.419,-1.433 -2.568,-4.276 -1.988,-0.66 -3.432,-2.514 -3.432,-4.724 0,-1.449 0.625,-2.743 1.609,-3.656 -0.376,-0.702 -0.609,-1.492 -0.609,-2.344 0,-1.959 1.136,-3.636 2.775,-4.457 1.283,-1.921 2.997,-2.543 4.225,-2.543 l 16,0 c 1.378,0 3.373,0.779 4.677,3.309 1.932,0.691 3.323,2.521 3.323,4.691 C 2.102,-2.384 1.268,-0.907 0,0"/></g><g transform="translate(18,30)" id="g24"><path id="path26" style="fill:#fdd888;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.55,0 1.058,0.158 1.5,0.416 1.943,0.158 2.451,0 3,0 4.657,0 7,2.344 7,4 7,4 7,6 5,6 4.212,6 4,5 3,5 2,5 2,6 0,6 -2,6 -2,5 -3,5 -4,5 -4.211,6 -5,6 -7,6 -7,4 -7,4 -7,2.344 -4.656,0 -3,0 -2.451,0 -1.943,0.158 -1.5,0.416 -1.057,0.158 -0.549,0 0,0"/></g><g transform="translate(24,30)" id="g28"><path id="path30" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 l -10,0 c -0.552,0 -1,0.448 -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(23.9014,11.458)" id="g32"><path id="path34" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,4.477 -8.581,4.185 -8.581,6.886 0,1.308 1.302,1.947 2.812,1.947 2.538,0 2.99,-1.568 4.139,-1.568 0.814,0 1.205,0.493 1.205,1.046 0,1.283 -2.024,2.255 -3.965,2.592 l 0,1.239 c 0,0.773 -0.65,1.4 -1.454,1.4 -0.805,0 -1.456,-0.627 -1.456,-1.4 l 0,-1.284 c -2.117,-0.463 -3.937,-1.875 -3.937,-4.176 0,-4.299 8.579,-4.124 8.579,-7.145 0,-1.047 -1.178,-2.093 -3.111,-2.093 -2.901,0 -3.867,1.889 -5.045,1.889 -0.574,0 -1.087,-0.464 -1.087,-1.164 0,-1.113 1.937,-2.451 4.602,-2.824 0,-0.003 -10e-4,-0.006 -10e-4,-0.01 l 0,-1.398 c 0,-0.773 0.652,-1.401 1.456,-1.401 0.804,0 1.455,0.628 1.455,1.401 l 0,1.398 c 0,0.017 -0.007,0.03 -0.008,0.045 C -2,-4.189 0,-2.687 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FDD888" d="M31.898 23.938C31.3 17.32 28 14 28 14l-6-8h-8l-6 8s-1.419 1.433-2.567 4.275C3.444 18.935 2 20.789 2 23c0 1.448.625 2.742 1.609 3.655C3.233 27.357 3 28.147 3 29c0 1.958 1.136 3.636 2.775 4.456C7.058 35.378 8.772 36 10 36h16c1.379 0 3.373-.779 4.678-3.31C32.609 31.999 34 30.17 34 28c0-1.678-.834-3.154-2.102-4.062zM18 6c.55 0 1.058-.158 1.5-.416.443.258.951.416 1.5.416 1.657 0 4-2.344 4-4 0 0 0-2-2-2-.788 0-1 1-2 1s-1-1-3-1-2 1-3 1-1.211-1-2-1c-2 0-2 2-2 2 0 1.656 2.344 4 4 4 .549 0 1.057-.158 1.5-.416.443.258.951.416 1.5.416z"/><path fill="#BF6952" d="M24 6c0 .552-.447 1-1 1H13c-.552 0-1-.448-1-1s.448-1 1-1h10c.553 0 1 .448 1 1z"/><path fill="#67757F" d="M23.901 24.542c0-4.477-8.581-4.185-8.581-6.886 0-1.308 1.301-1.947 2.811-1.947 2.538 0 2.99 1.569 4.139 1.569.813 0 1.205-.493 1.205-1.046 0-1.284-2.024-2.256-3.965-2.592V12.4c0-.773-.65-1.4-1.454-1.4-.805 0-1.456.627-1.456 1.4v1.283c-2.116.463-3.937 1.875-3.937 4.176 0 4.299 8.579 4.125 8.579 7.145 0 1.047-1.178 2.093-3.111 2.093-2.901 0-3.867-1.889-5.045-1.889-.574 0-1.087.464-1.087 1.164 0 1.113 1.938 2.451 4.603 2.824l-.001.01v1.398c0 .772.652 1.4 1.456 1.4.804 0 1.455-.628 1.455-1.4v-1.398c0-.017-.008-.03-.009-.045 2.398-.43 4.398-1.932 4.398-4.619z"/></svg>
\ No newline at end of file