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/1f6bd.svg b/public/emoji/1f6bd.svg
index 7caf81207..246344847 100644
--- a/public/emoji/1f6bd.svg
+++ b/public/emoji/1f6bd.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(26,18)" id="g20"><path id="path22" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-2 -12.707,0 c -0.867,0 -1.835,-0.895 -2.161,-2 l -3.542,-12 c -0.326,-1.105 0.306,-2 1.41,-2 l 18,0 c 1.105,0 2,0.895 2,2 l 0,9 0,1 c 0,1.861 1.278,3.412 3,3.858 L 6,0 0,0 Z"/></g><g transform="translate(22,14.125)" id="g24"><path id="path26" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.52 -4.477,-7.125 -10,-7.125 -5.523,0 -10,3.605 -10,7.125 0,1.875 0.833,1.875 10,1.875 9.166,0 10,0 10,-1.875"/></g><g transform="translate(25,17)" id="g28"><path id="path30" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.514,-1 -1.15,-1 l -20.7,0 c -0.635,0 -1.15,0.447 -1.15,1 0,0.553 0.515,1 1.15,1 l 20.7,0 C -0.514,1 0,0.553 0,0"/></g><g transform="translate(18,20)" id="g32"><path id="path34" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -12,0 c -1.104,0 -2,-0.895 -2,-2 L 2,-2 C 2,-0.895 1.105,0 0,0"/></g><g transform="translate(20,36)" id="g36"><path id="path38" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-18 c 1.105,0 2,1.007 2,2.25 l 0,13.5 C 2,-1.007 1.105,0 0,0"/></g><g transform="translate(34,32)" id="g40"><path id="path42" 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 -8,0 c -1.104,0 -2,-0.896 -2,-2 l 0,-1 0,-13 c 0,-1.104 0.896,-2 2,-2 l 8,0 c 1.105,0 2,0.896 2,2 l 0,13 0,1 z"/></g><g transform="translate(22,20)" id="g44"><path id="path46" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2"/></g><path id="path48" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 34,30 -12,0 0,2 12,0 0,-2 z"/><g transform="translate(25,15)" id="g50"><path id="path52" style="fill:#aab8c2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -21,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L -1,1 C -0.447,1 0,0.553 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#AAB8C2" d="M26 18v2H13.293c-.867 0-1.835.896-2.161 2L7.59 34c-.326 1.104.306 2 1.41 2h18c1.104 0 2-.896 2-2V24c0-1.861 1.278-3.412 3-3.858V18h-6z"/><path fill="#E1E8ED" d="M22 21.875C22 25.396 17.522 29 12 29c-5.523 0-10-3.604-10-7.125C2 20 2.833 20 12 20c9.166 0 10 0 10 1.875zM25 19c0 .553-.514 1-1.15 1H3.15C2.515 20 2 19.553 2 19c0-.553.515-1 1.15-1h20.7c.636 0 1.15.447 1.15 1z"/><path fill="#99AAB5" d="M18 16H6c-1.104 0-2 .896-2 2h16c0-1.104-.896-2-2-2zm2-16v18c1.104 0 2-1.007 2-2.25V2.25C22 1.007 21.104 0 20 0z"/><path fill="#E1E8ED" d="M34 4c0-1.104-.896-2-2-2h-8c-1.104 0-2 .896-2 2v14c0 1.104.896 2 2 2h8c1.104 0 2-.896 2-2V4z"/><circle fill="#CCD6DD" cx="20" cy="16" r="2"/><path fill="#CCD6DD" d="M22 4h12v2H22z"/><path fill="#AAB8C2" d="M25 21c0 .553-.447 1-1 1H3c-.552 0-1-.447-1-1 0-.553.448-1 1-1h21c.553 0 1 .447 1 1z"/></svg>
\ No newline at end of file