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/1f5c3.svg b/public/emoji/1f5c3.svg
index 743f964e6..48dd45b80 100644
--- a/public/emoji/1f5c3.svg
+++ b/public/emoji/1f5c3.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(35,16)" id="g20"><path id="path22" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-2 -4,-2 l -26,0 c -2.209,0 -4,-0.209 -4,2 l 2,12 c 0.125,1.917 1.791,4 4,4 l 22,0 c 2.209,0 3.791,-2.208 4,-4 L 0,0 Z"/></g><g transform="translate(28,23)" id="g24"><path id="path26" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -16,0 c -1.104,0 -2,0.896 -2,2 l 0,8 c 0,1.105 0.896,2 2,2 l 16,0 C -0.895,10 0,9.105 0,8 L 0,0 Z"/></g><g transform="translate(30,19)" id="g28"><path id="path30" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -20,0 c -1.104,0 -2,0.896 -2,2 l 0,8 c 0,1.105 0.896,2 2,2 l 20,0 C -0.895,10 0,9.105 0,8 L 0,0 Z"/></g><g transform="translate(32,15)" id="g32"><path id="path34" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -24,0 c -1.104,0 -2,0.896 -2,2 l 0,8 c 0,1.105 0.896,2 2,2 l 24,0 C -0.895,10 0,9.105 0,8 L 0,0 Z"/></g><g transform="translate(35,5)" id="g36"><path id="path38" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -26,0 c -2.209,0 -4,1.791 -4,4 l 0,11 c 0,2.209 1.791,4 4,4 l 26,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(13.9995,24)" id="g40"><path id="path42" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 Z"/></g><g transform="translate(13.9995,24)" id="g44"><path id="path46" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 Z"/></g><g transform="translate(22,35)" id="g48"><path id="path50" style="fill:#fcab40;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5,0 c -1.104,0 -2,-0.895 -2,-2 l 0,-1 4,0 c 1.105,0 2,-0.895 2,-2 l 1,0 c 1.105,0 2,0.896 2,2 l 0,1 C 2,-0.895 1.105,0 0,0"/></g><g transform="translate(18,31)" id="g52"><path id="path54" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5,0 c -1.104,0 -2,-0.895 -2,-2 l 0,-1 4,0 c 1.105,0 2,-0.895 2,-2 l 1,0 c 1.105,0 2,0.896 2,2 l 0,1 C 2,-0.895 1.105,0 0,0"/></g><g transform="translate(16,24)" id="g56"><path id="path58" style="fill:#e75a70;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -5,0 c -1.104,0 -2,0.896 -2,2 l 0,1 c 0,1.105 0.896,2 2,2 l 5,0 C -0.895,3 0,2.105 0,1 L 0,0 Z"/></g><g transform="translate(25,8)" id="g60"><path id="path62" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -10.001,0 c -1.104,0 -2,0.896 -2,2 l 0,5 c 0,1.105 0.896,2 2,2 L -2,7 C -0.895,7 0,6.105 0,5 L 0,0 Z"/></g><g transform="translate(13.9995,12)" id="g64"><path id="path66" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 Z"/></g><g transform="translate(23,9)" id="g68"><path id="path70" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -8.001,0 c -0.552,0 -1,0.447 -1,1 l 0,3 c 0,0.553 0.448,1 1,1 L -1,4 C -0.447,4 0,3.553 0,3 L 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#67757F" d="M35 20c0 2.209-1.791 2-4 2H5c-2.209 0-4 .209-4-2L3 8c.125-1.917 1.791-4 4-4h22c2.209 0 3.791 2.208 4 4l2 12z"/><path fill="#CCD6DD" d="M28 13c0 1.104-.896 2-2 2H10c-1.104 0-2-.896-2-2V5c0-1.105.896-2 2-2h16c1.104 0 2 .895 2 2v8z"/><path fill="#E1E8ED" d="M30 17c0 1.104-.896 2-2 2H8c-1.104 0-2-.896-2-2V9c0-1.104.896-2 2-2h20c1.104 0 2 .896 2 2v8z"/><path fill="#F5F8FA" d="M32 21c0 1.104-.896 2-2 2H6c-1.104 0-2-.896-2-2v-8c0-1.104.896-2 2-2h24c1.104 0 2 .896 2 2v8z"/><path fill="#9AAAB4" d="M35 31c0 2.209-1.791 4-4 4H5c-2.209 0-4-1.791-4-4V20c0-2.209 1.791-4 4-4h26c2.209 0 4 1.791 4 4v11z"/><path fill="#67757F" d="M14 12zm0 0z"/><path fill="#FCAB40" d="M22 1h-5c-1.104 0-2 .895-2 2v1h4c1.104 0 2 .896 2 2h1c1.104 0 2-.896 2-2V3c0-1.105-.896-2-2-2z"/><path fill="#5DADEC" d="M18 5h-5c-1.104 0-2 .896-2 2v1h4c1.104 0 2 .896 2 2h1c1.104 0 2-.896 2-2V7c0-1.104-.896-2-2-2z"/><path fill="#E75A70" d="M16 12c0 1.104-.896 2-2 2H9c-1.104 0-2-.896-2-2v-1c0-1.104.896-2 2-2h5c1.104 0 2 .896 2 2v1z"/><path fill="#67757F" d="M25 28c0 1.104-.896 2-2 2H13c-1.104 0-2-.896-2-2v-5c0-1.104.896-2 2-2h10c1.104 0 2 .896 2 2v5zm-11-4z"/><path fill="#E1E8ED" d="M23 27c0 .553-.447 1-1 1h-8c-.552 0-1-.447-1-1v-3c0-.553.448-1 1-1h8c.553 0 1 .447 1 1v3z"/></svg>
\ No newline at end of file