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/1f1ec-1f1ea.svg b/public/emoji/1f1ec-1f1ea.svg
index e1dc358f4..8c2bd5a63 100644
--- a/public/emoji/1f1ec-1f1ea.svg
+++ b/public/emoji/1f1ec-1f1ea.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(32,31)" id="g20"><path id="path22" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -11.5,0 0,-10.5 15.5,0 0,6.5 C 4,-1.791 2.209,0 0,0"/></g><g transform="translate(20.5,31)" id="g24"><path id="path26" style="fill:#e8112d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5,0 0,-10.5 -15.5,0 0,-5 15.5,0 0,-10.5 5,0 0,10.5 15.5,0 0,5 L 0,-10.5 0,0 Z"/></g><g transform="translate(28.9146,26.4145)" id="g28"><path id="path30" style="fill:#e8112d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.031,0.623 0.104,1.244 0.221,1.86 -0.367,1.786 -0.962,1.786 -1.55,1.86 -1.433,1.244 -1.36,0.623 -1.329,0 c -0.623,0.031 -1.245,0.104 -1.86,0.221 0.074,-0.588 0.074,-1.183 0,-1.771 0.615,0.117 1.237,0.19 1.86,0.221 -0.031,-0.623 -0.104,-1.244 -0.221,-1.86 0.588,0.074 1.183,0.074 1.771,0 C 0.104,-2.573 0.031,-1.952 0,-1.329 0.623,-1.36 1.244,-1.433 1.86,-1.55 1.786,-0.962 1.786,-0.367 1.86,0.221 1.244,0.104 0.623,0.031 0,0"/></g><g transform="translate(15.5,31)" id="g32"><path id="path34" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -11.5,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-6.5 15.5,0 L 0,0 Z"/></g><g transform="translate(8.4146,26.4145)" id="g36"><path id="path38" style="fill:#e8112d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.031,0.623 0.104,1.244 0.221,1.86 -0.367,1.786 -0.962,1.786 -1.55,1.86 -1.433,1.244 -1.36,0.623 -1.329,0 c -0.623,0.031 -1.245,0.104 -1.86,0.221 0.074,-0.588 0.074,-1.183 0,-1.771 0.615,0.117 1.237,0.19 1.86,0.221 -0.031,-0.623 -0.104,-1.244 -0.221,-1.86 0.588,0.074 1.183,0.074 1.771,0 C 0.104,-2.573 0.031,-1.952 0,-1.329 0.623,-1.36 1.244,-1.433 1.86,-1.55 1.786,-0.962 1.786,-0.367 1.86,0.221 1.244,0.104 0.623,0.031 0,0"/></g><g transform="translate(36,9)" id="g40"><path id="path42" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,6.5 -15.5,0 0,-10.5 11.5,0 c 2.209,0 4,1.791 4,4"/></g><g transform="translate(28.9146,9.5855)" id="g44"><path id="path46" style="fill:#e8112d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.031,-0.623 0.104,-1.244 0.221,-1.86 -0.588,0.074 -1.183,0.074 -1.771,0 0.117,0.616 0.19,1.237 0.221,1.86 -0.623,-0.031 -1.245,-0.104 -1.86,-0.221 0.074,0.588 0.074,1.183 0,1.771 0.615,-0.117 1.237,-0.19 1.86,-0.221 -0.031,0.623 -0.104,1.244 -0.221,1.86 0.588,-0.074 1.183,-0.074 1.771,0 C 0.104,2.573 0.031,1.952 0,1.329 0.623,1.36 1.244,1.433 1.86,1.55 1.786,0.962 1.786,0.367 1.86,-0.221 1.244,-0.104 0.623,-0.031 0,0"/></g><g transform="translate(15.5,15.5)" id="g48"><path id="path50" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -15.5,0 0,-6.5 c 0,-2.209 1.791,-4 4,-4 L 0,-10.5 0,0 Z"/></g><g transform="translate(8.4146,9.5855)" id="g52"><path id="path54" style="fill:#e8112d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.031,-0.623 0.104,-1.244 0.221,-1.86 -0.588,0.074 -1.183,0.074 -1.771,0 0.117,0.616 0.19,1.237 0.221,1.86 -0.623,-0.031 -1.245,-0.104 -1.86,-0.221 0.074,0.588 0.074,1.183 0,1.771 0.615,-0.117 1.237,-0.19 1.86,-0.221 -0.031,0.623 -0.104,1.244 -0.221,1.86 0.588,-0.074 1.183,-0.074 1.771,0 C 0.104,2.573 0.031,1.952 0,1.329 0.623,1.36 1.244,1.433 1.86,1.55 1.786,0.962 1.786,0.367 1.86,-0.221 1.244,-0.104 0.623,-0.031 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#EEE" d="M32 5H20.5v10.5H36V9c0-2.209-1.791-4-4-4z"/><path fill="#E8112D" d="M20.5 5h-5v10.5H0v5h15.5V31h5V20.5H36v-5H20.5z"/><path fill="#E8112D" d="M28.915 9.585c.031-.623.104-1.244.221-1.86-.588.073-1.183.073-1.77 0 .117.615.19 1.237.221 1.86-.623-.031-1.244-.104-1.86-.221.073.588.073 1.183 0 1.77.615-.117 1.237-.19 1.86-.221-.031.623-.104 1.244-.221 1.86.588-.073 1.183-.073 1.77 0-.117-.615-.19-1.237-.221-1.86.623.031 1.244.104 1.86.221-.073-.588-.073-1.183 0-1.77-.616.118-1.237.191-1.86.221z"/><path fill="#EEE" d="M15.5 5H4C1.791 5 0 6.791 0 9v6.5h15.5V5z"/><path fill="#E8112D" d="M8.415 9.585c.031-.623.104-1.244.221-1.86-.588.073-1.183.073-1.77 0 .117.615.19 1.237.221 1.86-.623-.031-1.244-.104-1.86-.221.073.588.073 1.183 0 1.77.615-.117 1.237-.19 1.86-.221-.031.623-.104 1.244-.221 1.86.588-.073 1.183-.073 1.77 0-.117-.615-.19-1.237-.221-1.86.623.031 1.244.104 1.86.221-.073-.588-.073-1.183 0-1.77-.616.118-1.237.191-1.86.221z"/><path fill="#EEE" d="M36 27v-6.5H20.5V31H32c2.209 0 4-1.791 4-4z"/><path fill="#E8112D" d="M28.915 26.415c.031.623.104 1.244.221 1.86-.588-.073-1.183-.073-1.77 0 .117-.615.19-1.237.221-1.86-.623.031-1.244.104-1.86.221.073-.588.073-1.183 0-1.77.615.117 1.237.19 1.86.221-.031-.623-.104-1.244-.221-1.86.588.073 1.183.073 1.77 0-.117.615-.19 1.237-.221 1.86.623-.031 1.244-.104 1.86-.221-.073.588-.073 1.183 0 1.77-.616-.118-1.237-.191-1.86-.221z"/><path fill="#EEE" d="M15.5 20.5H0V27c0 2.209 1.791 4 4 4h11.5V20.5z"/><path fill="#E8112D" d="M8.415 26.415c.031.623.104 1.244.221 1.86-.588-.073-1.183-.073-1.77 0 .117-.615.19-1.237.221-1.86-.623.031-1.244.104-1.86.221.073-.588.073-1.183 0-1.77.615.117 1.237.19 1.86.221-.031-.623-.104-1.244-.221-1.86.588.073 1.183.073 1.77 0-.117.615-.19 1.237-.221 1.86.623-.031 1.244-.104 1.86-.221-.073.588-.073 1.183 0 1.77-.616-.118-1.237-.191-1.86-.221z"/></svg>
\ No newline at end of file