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/1f96b.svg b/public/emoji/1f96b.svg
index bef3815b1..9c451ed0d 100644
--- a/public/emoji/1f96b.svg
+++ b/public/emoji/1f96b.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(30.0003,3.5003)" id="g20"><path id="path22" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.933 -5.373,-3.5 -12,-3.5 -6.628,0 -12,1.567 -12,3.5 0,1.932 5.372,3.5 12,3.5 C -5.373,3.5 0,1.932 0,0"/></g><path id="path24" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 30,3.5 -24,0 0,1 24,0 0,-1 z"/><g transform="translate(30.0003,4.4997)" id="g26"><path id="path28" style="fill:#e6e7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.932 -5.373,-3.5 -12,-3.5 -6.628,0 -12,1.568 -12,3.5 0,1.933 5.372,3.5 12,3.5 C -5.373,3.5 0,1.933 0,0"/></g><g transform="translate(29.0003,4.9997)" id="g30"><path id="path32" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.656 -4.926,-3 -11,-3 -6.076,0 -11,1.344 -11,3 0,1.657 4.924,3 11,3 C -4.926,3 0,1.657 0,0"/></g><path id="path34" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 29,28 7,28 7,5 29,5 29,28 Z"/><g transform="translate(29,12.9996)" id="g36"><path id="path38" style="fill:#a6d388;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.933 -4.926,-3.5 -11,-3.5 -6.076,0 -11,1.567 -11,3.5 0,1.933 4.924,3.5 11,3.5 C -4.926,3.5 0,1.933 0,0"/></g><path id="path40" style="fill:#a6d388;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 29,26 7,26 7,13 29,13 29,26 Z"/><g transform="translate(29,21.9996)" id="g42"><path id="path44" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.932 -4.926,-3.5 -11,-3.5 -6.075,0 -10.999,1.568 -10.999,3.5 0,1.933 4.924,3.5 10.999,3.5 C -4.926,3.5 0,1.933 0,0"/></g><path id="path46" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 29,32 7,32 7,22 29,22 29,32 Z"/><g transform="translate(30.0003,31.5003)" id="g48"><path id="path50" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.933 -5.373,-3.5 -12,-3.5 -6.628,0 -12,1.567 -12,3.5 0,1.932 5.372,3.5 12,3.5 C -5.373,3.5 0,1.932 0,0"/></g><path id="path52" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 30,31.5 -24,0 0,1 24,0 0,-1 z"/><g transform="translate(30.0003,32.4997)" id="g54"><path id="path56" style="fill:#e6e7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.932 -5.373,-3.5 -12,-3.5 -6.628,0 -12,1.568 -12,3.5 0,1.933 5.372,3.5 12,3.5 C -5.373,3.5 0,1.933 0,0"/></g><g transform="translate(28.2498,32.5)" id="g58"><path id="path60" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.381 -4.588,-2.5 -10.25,-2.5 -5.662,0 -10.25,1.119 -10.25,2.5 0,1.381 4.588,2.5 10.25,2.5 C -4.588,2.5 0,1.381 0,0"/></g><g transform="translate(27.2498,32.5)" id="g62"><path id="path64" style="fill:#e6e7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -4.14,-2 -9.25,-2 -5.109,0 -9.25,0.895 -9.25,2 0,1.105 4.141,2 9.25,2 C -4.14,2 0,1.105 0,0"/></g><g transform="translate(23.9998,32.5)" id="g66"><path id="path68" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.69 -2.686,-1.25 -6,-1.25 -3.314,0 -6,0.56 -6,1.25 0,0.69 2.686,1.25 6,1.25 3.314,0 6,-0.56 6,-1.25"/></g><g transform="translate(22.7498,32.5)" id="g70"><path id="path72" style="fill:#e6e7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.414 -2.126,-0.75 -4.75,-0.75 -2.624,0 -4.75,0.336 -4.75,0.75 0,0.414 2.126,0.75 4.75,0.75 C -2.126,0.75 0,0.414 0,0"/></g><g transform="translate(25,15.0003)" id="g74"><path id="path76" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.142 -3.134,-7.5 -7,-7.5 -3.866,0 -7,3.358 -7,7.5 0,4.142 3.134,7.5 7,7.5 3.866,0 7,-3.358 7,-7.5"/></g><g transform="translate(23,15.0002)" id="g78"><path id="path80" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.156 -2.238,-5.714 -5,-5.714 -2.762,0 -5,2.558 -5,5.714 0,3.156 2.238,5.714 5,5.714 2.762,0 5,-2.558 5,-5.714"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#99AAB5" d="M30 32.5c0 1.933-5.373 3.5-12 3.5S6 34.433 6 32.5c0-1.932 5.372-3.5 12-3.5 6.627 0 12 1.567 12 3.5z"/><path fill="#99AAB5" d="M6 31.5h24v1H6z"/><path fill="#E6E7E8" d="M30 31.5c0 1.933-5.373 3.5-12 3.5S6 33.433 6 31.5 11.372 28 18 28c6.627 0 12 1.567 12 3.5z"/><path fill="#5C913B" d="M29 31c0 1.656-4.926 3-11 3-6.075 0-11-1.343-11-3s4.924-3 11-3c6.075 0 11 1.343 11 3z"/><path fill="#5C913B" d="M7 8h22v23H7z"/><path fill="#A6D388" d="M29 23c0 1.932-4.926 3.5-11 3.5-6.075 0-11-1.567-11-3.5s4.924-3.5 11-3.5c6.074 0 11 1.567 11 3.5z"/><path fill="#A6D388" d="M7 10h22v13H7z"/><path fill="#5C913B" d="M29 14c0 1.932-4.926 3.5-11 3.5-6.075 0-10.999-1.567-10.999-3.5S11.925 10.5 18 10.5c6.074 0 11 1.567 11 3.5z"/><path fill="#5C913B" d="M7 4h22v10H7z"/><path fill="#99AAB5" d="M30 4.5C30 6.433 24.627 8 18 8S6 6.433 6 4.5 11.373 1 18 1s12 1.567 12 3.5z"/><path fill="#99AAB5" d="M6 3.5h24v1H6z"/><path fill="#E6E7E8" d="M30 3.5C30 5.433 24.627 7 18 7S6 5.433 6 3.5 11.373 0 18 0s12 1.567 12 3.5z"/><path fill="#CCD6DD" d="M28.25 3.5C28.25 4.881 23.662 6 18 6S7.75 4.881 7.75 3.5 12.338 1 18 1s10.25 1.119 10.25 2.5z"/><path fill="#E6E7E8" d="M27.25 3.5c0 1.105-4.14 2-9.25 2s-9.25-.895-9.25-2 4.141-2 9.25-2c5.11 0 9.25.895 9.25 2z"/><path fill="#CCD6DD" d="M24 3.5c0 .69-2.686 1.25-6 1.25s-6-.56-6-1.25 2.686-1.25 6-1.25 6 .56 6 1.25z"/><ellipse fill="#E6E7E8" cx="18" cy="3.5" rx="4.75" ry=".75"/><path fill="#FFCC4D" d="M25 21c0 4.142-3.134 7.5-7 7.5s-7-3.358-7-7.5 3.134-7.5 7-7.5 7 3.358 7 7.5z"/><path fill="#FFAC33" d="M23 21c0 3.156-2.239 5.715-5 5.715s-5-2.56-5-5.715 2.238-5.714 5-5.714 5 2.558 5 5.714z"/></svg>
\ No newline at end of file