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/1f376.svg b/public/emoji/1f376.svg
index f8df7b4fb..2bb872e15 100644
--- a/public/emoji/1f376.svg
+++ b/public/emoji/1f376.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(33,15)" id="g20"><path id="path22" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.56,2.797 -2.108,6.956 -3.707,10.015 1.8,1.248 3.359,3.716 3.359,8.483 C -1,19 -1.629,19 -3,19 c -1.37,0 -3.77,1 -3.77,1 l -0.687,0 -0.685,0 c 0,0 -2.171,-1 -2.858,-1 -0.686,0 -3.043,0.043 -3.513,-0.427 0,-4.709 1.613,-7.207 3.337,-8.49 C -12.749,7.006 -14.301,2.794 -15,0 c -1,-4 -0.034,-9.327 0,-9.5 0.312,-1.584 2.254,-3.5 7.5,-3.5 5.246,0 7.021,1.999 7.5,3.5 0.056,0.175 1,4.5 0,9.5"/></g><g transform="translate(32.626,33.7041)" id="g24"><path id="path26" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.988 -2.162,-1.789 -7.083,-1.789 -4.921,0 -7.083,0.801 -7.083,1.789 0,0.989 2.162,1.789 7.083,1.789 C -2.162,1.789 0,0.989 0,0"/></g><g transform="translate(25.4307,31.3564)" id="g28"><path id="path30" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.154,0 -5.515,0.701 -6.154,1.001 -0.5,0.235 -0.716,0.83 -0.481,1.33 0.235,0.5 0.827,0.716 1.33,0.481 C -4.573,2.468 0.288,1.104 5.74,2.906 6.262,3.078 6.83,2.794 7.003,2.27 7.177,1.745 6.892,1.18 6.367,1.006 4.093,0.255 1.901,0 0,0"/></g><g transform="translate(19.6523,11.6113)" id="g32"><path id="path34" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.104 -0.868,1.389 -2.542,1.389 l -5.301,0 -0.837,0 -0.837,0 -5.301,0 c -0.838,0 -2.478,0.48 -2.478,-1.297 0,-10.199 6.195,-11.906 8.366,-11.906 3.008,0 8.93,1.55 8.93,11.814"/></g><g transform="translate(19.6211,12.3086)" id="g36"><path id="path38" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.206 -2.639,-2.184 -8.649,-2.184 -6.01,0 -8.649,0.978 -8.649,2.184 0,1.207 2.639,2.184 8.649,2.184 C -2.639,2.184 0,1.207 0,0"/></g><g transform="translate(10.8276,9.6621)" id="g40"><path id="path42" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.801,0 -6.643,0.841 -7.413,1.202 -0.5,0.235 -0.715,0.829 -0.482,1.329 0.235,0.501 0.829,0.718 1.331,0.482 C -5.658,2.588 0.363,0.898 7.085,3.118 7.612,3.293 8.175,3.008 8.348,2.482 8.522,1.958 8.237,1.393 7.713,1.22 4.956,0.309 2.302,0 0,0"/></g><g transform="translate(28.667,19.6045)" id="g44"><path id="path46" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.955 -0.793,-1.73 -1.771,-1.73 -0.978,0 -1.771,0.775 -1.771,1.73 0,0.955 0.793,1.729 1.771,1.729 C -0.793,1.729 0,0.955 0,0"/></g><g transform="translate(30.667,17.6045)" id="g48"><path id="path50" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.955 -0.793,-1.73 -1.771,-1.73 -0.978,0 -1.771,0.775 -1.771,1.73 0,0.955 0.793,1.729 1.771,1.729 C -0.793,1.729 0,0.955 0,0"/></g><g transform="translate(28.667,16.6045)" id="g52"><path id="path54" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.955 -0.793,-1.73 -1.771,-1.73 -0.978,0 -1.771,0.775 -1.771,1.73 0,0.955 0.793,1.729 1.771,1.729 C -0.793,1.729 0,0.955 0,0"/></g><g transform="translate(22.0742,10.0469)" id="g56"><path id="path58" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.658,-0.262 0.974,-1.021 0.706,-1.694 -0.269,-0.674 -1.02,-1.007 -1.678,-0.745 -0.657,0.261 -0.973,1.02 -0.705,1.694 C -1.409,-0.071 -0.657,0.263 0,0"/></g><g transform="translate(24.001,10.876)" id="g60"><path id="path62" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.658,-0.262 0.974,-1.021 0.706,-1.694 -0.269,-0.674 -1.02,-1.008 -1.678,-0.747 -0.657,0.263 -0.974,1.022 -0.705,1.696 C -1.408,-0.071 -0.657,0.262 0,0"/></g><g transform="translate(24.1416,9.2236)" id="g64"><path id="path66" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.657,-0.262 0.973,-1.021 0.705,-1.694 0.436,-2.368 -0.314,-2.701 -0.973,-2.439 -1.63,-2.178 -1.946,-1.419 -1.678,-0.745 -1.409,-0.071 -0.657,0.263 0,0"/></g><g transform="translate(28.75,17.875)" id="g68"><path id="path70" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.621 -0.504,-1.125 -1.125,-1.125 -0.621,0 -1.125,0.504 -1.125,1.125 0,0.621 0.504,1.125 1.125,1.125 C -0.504,1.125 0,0.621 0,0"/></g><g transform="translate(23.792,8.916)" id="g72"><path id="path74" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.436 -0.355,-0.791 -0.792,-0.791 -0.437,0 -0.791,0.355 -0.791,0.791 0,0.437 0.354,0.792 0.791,0.792 C -0.355,0.792 0,0.437 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#55ACEE" d="M33 21c-.56-2.797-2.108-6.956-3.707-10.015 1.8-1.248 3.359-3.716 3.359-8.482C32 2 31.371 2 30 2c-1.37 0-3.771-1-3.771-1h-1.372s-2.171 1-2.858 1c-.685 0-3.043-.043-3.513.427 0 4.709 1.612 7.207 3.337 8.491C20.251 13.994 18.699 18.206 18 21c-1 4-.034 9.327 0 9.5.312 1.584 2.254 3.5 7.5 3.5s7.021-1.999 7.5-3.5c.056-.175 1-4.5 0-9.5z"/><ellipse fill="#3B88C3" cx="25.543" cy="2.296" rx="7.083" ry="1.789"/><path fill="#88C9F9" d="M25.431 4.644c-3.154 0-5.515-.701-6.154-1.001-.5-.235-.715-.83-.48-1.33.234-.5.827-.716 1.33-.48.731.344 5.593 1.707 11.045-.094.521-.172 1.09.112 1.263.636.174.524-.111 1.09-.636 1.263-2.276.75-4.467 1.006-6.368 1.006z"/><path fill="#CCD6DD" d="M19.652 24.389c0-1.104-.868-1.389-2.542-1.389H4.834c-.837 0-2.478-.48-2.478 1.297 0 10.199 6.195 11.906 8.366 11.906 3.008 0 8.93-1.551 8.93-11.814z"/><path fill="#8899A6" d="M19.621 23.691c0 1.206-2.639 2.184-8.649 2.184s-8.649-.978-8.649-2.184c0-1.207 2.64-2.184 8.649-2.184 6.01.001 8.649.977 8.649 2.184z"/><path fill="#FFF" d="M10.828 26.338c-3.801 0-6.643-.841-7.413-1.202-.5-.234-.715-.829-.481-1.329.235-.501.829-.718 1.33-.481.906.425 6.928 2.114 13.649-.105.527-.175 1.09.11 1.263.636.174.524-.111 1.09-.635 1.263-2.758.909-5.412 1.218-7.713 1.218z"/><path fill="#88C9F9" d="M28.667 16.396c0 .955-.793 1.729-1.771 1.729-.979 0-1.771-.774-1.771-1.729 0-.955.793-1.729 1.771-1.729.978 0 1.771.774 1.771 1.729z"/><path fill="#88C9F9" d="M30.667 18.396c0 .955-.793 1.729-1.771 1.729-.979 0-1.771-.774-1.771-1.729 0-.955.793-1.729 1.771-1.729.978 0 1.771.774 1.771 1.729z"/><path fill="#88C9F9" d="M28.667 19.396c0 .955-.793 1.729-1.771 1.729-.979 0-1.771-.774-1.771-1.729 0-.955.793-1.729 1.771-1.729.978 0 1.771.774 1.771 1.729zm-6.593 6.557c.658.262.974 1.021.706 1.694-.269.674-1.02 1.007-1.678.745-.657-.262-.974-1.02-.705-1.694.268-.674 1.02-1.008 1.677-.745z"/><path fill="#88C9F9" d="M24.001 25.124c.658.262.974 1.021.706 1.694-.269.674-1.021 1.008-1.678.746-.657-.263-.975-1.022-.705-1.695.269-.674 1.02-1.007 1.677-.745z"/><path fill="#88C9F9" d="M24.142 26.776c.657.262.973 1.021.705 1.694-.269.674-1.02 1.007-1.678.745-.657-.262-.974-1.021-.705-1.694.268-.673 1.02-1.007 1.678-.745z"/><circle fill="#BBDDF5" cx="27.625" cy="18.125" r="1.125"/><path fill="#BBDDF5" d="M23.792 27.084c0 .437-.354.791-.792.791-.437 0-.791-.354-.791-.791 0-.438.354-.792.791-.792.438 0 .792.354.792.792z"/></svg>
\ No newline at end of file