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/1f321.svg b/public/emoji/1f321.svg
index 8f55e77e1..95a75984e 100644
--- a/public/emoji/1f321.svg
+++ b/public/emoji/1f321.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.5355,33.5355)" id="g20"><path id="path22" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.953,1.953 -5.118,1.953 -7.071,0 l -1.197,-1.199 2.842,-2.842 c 0.39,-0.391 0.39,-1.024 0,-1.414 -0.195,-0.196 -0.451,-0.293 -0.707,-0.293 -0.256,0 -0.512,0.097 -0.707,0.293 l -2.841,2.841 -2.109,-2.111 2.84,-2.84 c 0.391,-0.39 0.391,-1.023 0,-1.414 -0.195,-0.195 -0.451,-0.293 -0.707,-0.293 -0.255,0 -0.511,0.098 -0.707,0.293 l -2.839,2.839 -2.12,-2.123 2.837,-2.837 c 0.391,-0.391 0.391,-1.024 0,-1.415 -0.195,-0.195 -0.451,-0.292 -0.707,-0.292 -0.256,0 -0.511,0.097 -0.707,0.292 l -2.836,2.837 -2.121,-2.122 2.836,-2.836 c 0.391,-0.391 0.391,-1.024 0,-1.414 -0.195,-0.195 -0.451,-0.293 -0.707,-0.293 -0.256,0 -0.512,0.098 -0.707,0.293 l -2.835,2.835 -2.12,-2.123 2.833,-2.833 c 0.391,-0.391 0.391,-1.024 0,-1.414 -0.195,-0.196 -0.451,-0.293 -0.707,-0.293 -0.255,0 -0.511,0.097 -0.707,0.293 l -2.832,2.832 -1.783,-1.785 c -3.842,-0.027 -6.95,-3.148 -6.95,-6.998 0,-3.865 3.135,-7 7,-7 3.833,0 6.942,3.081 6.995,6.901 L 0,-7.071 C 1.953,-5.118 1.953,-1.953 0,0"/></g><g transform="translate(30.938,30.9086)" id="g24"><path id="path26" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.781,0.781 -2.047,0.781 -2.828,0 l -19.065,-19.065 c -1.338,0.362 -2.823,0.035 -3.873,-1.015 -1.563,-1.562 -1.563,-4.095 0,-5.657 1.562,-1.562 4.094,-1.562 5.656,0 1.039,1.038 1.371,2.502 1.029,3.828 L 0,-2.828 C 0.781,-2.047 0.781,-0.781 0,0"/></g><g transform="translate(13.272,13.6572)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.256,0 0.512,0.098 0.707,0.293 0.391,0.391 0.391,1.023 0,1.414 L -2.126,4.54 -3.54,3.125 -0.707,0.293 C -0.512,0.098 -0.256,0 0,0"/></g><g transform="translate(16.8076,17.1924)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.256,0 0.512,0.098 0.707,0.293 0.391,0.391 0.391,1.023 0,1.414 L -2.129,4.543 -3.542,3.128 -0.707,0.293 C -0.512,0.098 -0.256,0 0,0"/></g><g transform="translate(20.3428,20.728)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.256,0 0.512,0.098 0.707,0.293 0.391,0.39 0.391,1.023 0,1.414 L -2.13,4.545 -3.544,3.13 -0.707,0.293 C -0.512,0.098 -0.256,0 0,0"/></g><g transform="translate(23.8789,24.2637)" id="g40"><path id="path42" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.256,0 0.512,0.098 0.707,0.293 0.391,0.391 0.391,1.024 0,1.414 l -2.841,2.84 -1.413,-1.415 2.84,-2.839 C -0.512,0.098 -0.256,0 0,0"/></g><g transform="translate(27.4023,27.7871)" id="g44"><path id="path46" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.256,0 0.512,0.098 0.707,0.293 0.391,0.39 0.391,1.023 0,1.414 L -2.135,4.55 -3.548,3.135 -0.707,0.293 C -0.512,0.098 -0.256,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M33.536 2.464c-1.953-1.953-5.118-1.953-7.071 0l-1.197 1.199 2.842 2.843c.391.391.391 1.024 0 1.414-.195.195-.451.293-.707.293s-.512-.098-.707-.293l-2.841-2.842-2.11 2.112 2.841 2.84c.391.39.391 1.023 0 1.414-.195.195-.451.293-.707.293s-.512-.098-.707-.293l-2.84-2.839-2.12 2.122 2.837 2.838c.391.391.391 1.024 0 1.414-.195.195-.451.293-.707.293s-.512-.098-.707-.293l-2.837-2.837-2.12 2.123 2.836 2.836c.391.391.391 1.023 0 1.414-.195.195-.451.293-.707.293s-.512-.098-.707-.293l-2.835-2.835-2.12 2.123 2.833 2.833c.391.391.391 1.023 0 1.414-.195.195-.451.293-.707.293s-.512-.098-.707-.293l-2.833-2.832-1.781 1.785C4.107 21.03 1 24.151 1 28c0 3.866 3.134 7 7 7 3.832 0 6.941-3.081 6.995-6.9L33.536 9.536c1.952-1.953 1.952-5.119 0-7.072z"/><path fill="#DD2E44" d="M30.938 5.091c-.781-.781-2.047-.781-2.828 0L9.045 24.156c-1.338-.362-2.823-.035-3.873 1.015-1.562 1.562-1.562 4.095 0 5.657 1.562 1.562 4.095 1.562 5.657 0C11.867 29.79 12.2 28.326 11.858 27l19.08-19.08c.781-.781.781-2.048 0-2.829z"/><path fill="#292F33" d="M13.272 22.343c.256 0 .512-.098.707-.293.391-.391.391-1.023 0-1.414l-2.833-2.833-1.413 1.415 2.833 2.832c.194.195.45.293.706.293zm3.536-3.535c.256 0 .512-.098.707-.293.391-.391.391-1.023 0-1.414l-2.836-2.836-1.413 1.415 2.835 2.835c.195.195.451.293.707.293zm3.535-3.536c.256 0 .512-.098.707-.293.391-.39.391-1.023 0-1.414l-2.837-2.838-1.413 1.415 2.837 2.837c.194.195.45.293.706.293zm3.536-3.536c.256 0 .512-.098.707-.293.391-.391.391-1.024 0-1.414l-2.841-2.84-1.413 1.415 2.84 2.839c.195.196.451.293.707.293zm3.523-3.523c.256 0 .512-.098.707-.293.391-.39.391-1.023 0-1.414l-2.842-2.843-1.413 1.415 2.841 2.842c.196.195.451.293.707.293z"/></svg>
\ No newline at end of file