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/2622.svg b/public/emoji/2622.svg
index 22fe96a7b..2039db1b7 100644
--- a/public/emoji/2622.svg
+++ b/public/emoji/2622.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(18,35)" id="g20"><path id="path22" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -9.389,0 -17,-7.611 -17,-17 0,-9.389 7.611,-17 17,-17 9.389,0 17,7.611 17,17 C 17,-7.611 9.389,0 0,0"/></g><g transform="translate(15.2722,14.4022)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3.85,-6.427 c 0.278,-0.183 0.561,-0.36 0.854,-0.52 1.702,-0.927 3.652,-1.455 5.724,-1.455 2.077,0 4.033,0.532 5.738,1.464 0.293,0.161 0.577,0.336 0.854,0.52 L 5.466,0.008 C 4.703,-0.574 3.762,-0.934 2.728,-0.934 1.699,-0.934 0.761,-0.578 0,0"/></g><g transform="translate(16.1187,22.1121)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -3.854,6.425 C -4.147,6.265 -4.43,6.089 -4.708,5.906 c -3.124,-2.062 -5.22,-5.543 -5.385,-9.518 -0.007,-0.167 -0.026,-0.331 -0.026,-0.5 0,-0.169 0.019,-0.333 0.026,-0.5 l 7.493,0 c -0.019,0.166 -0.051,0.329 -0.051,0.5 0,1.829 1.09,3.396 2.651,4.112"/></g><g transform="translate(22.5319,18)" id="g32"><path id="path34" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.171 -0.032,-0.334 -0.05,-0.5 l 7.493,0 C 7.45,-0.333 7.468,-0.169 7.468,0 7.468,0.169 7.45,0.333 7.443,0.5 7.278,4.474 5.183,7.954 2.061,10.016 1.783,10.199 1.5,10.375 1.207,10.535 L -2.643,4.108 C -1.087,3.391 0,1.827 0,0"/></g><g transform="translate(20,18)" id="g36"><path id="path38" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.895,-2 -2,-2 -1.105,0 -2,0.895 -2,2 0,1.105 0.895,2 2,2 1.105,0 2,-0.895 2,-2"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><circle fill="#F4900C" cx="18" cy="18" r="17"/><path fill="#FFF" d="M15.272 21.598l-3.85 6.427c.278.183.561.36.854.519C13.978 29.472 15.929 30 18 30c2.078 0 4.033-.532 5.739-1.464.293-.16.576-.336.854-.519l-3.855-6.427c-.763.583-1.704.942-2.738.942-1.029 0-1.967-.356-2.728-.934zm.847-7.71l-3.854-6.425c-.293.16-.577.336-.854.52-3.124 2.062-5.22 5.543-5.385 9.518-.008.166-.026.33-.026.499s.018.333.025.5h7.493c-.018-.166-.05-.329-.05-.5 0-1.829 1.09-3.396 2.651-4.112zM22.532 18c0 .171-.032.334-.05.5h7.493c.007-.167.025-.331.025-.5s-.018-.333-.025-.5c-.165-3.974-2.26-7.454-5.382-9.516-.278-.183-.561-.359-.854-.52l-3.85 6.427c1.556.718 2.643 2.282 2.643 4.109z"/><circle fill="#FFF" cx="18" cy="18" r="2"/></svg>
\ No newline at end of file