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/1f4ba.svg b/public/emoji/1f4ba.svg
index 1ae3854de..bf27bb184 100644
--- a/public/emoji/1f4ba.svg
+++ b/public/emoji/1f4ba.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(11,9)" id="g20"><path id="path22" style="fill:#9aaab4;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 l 0,11 c 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2 L 0,0 Z"/></g><g transform="translate(31,9)" id="g24"><path id="path26" style="fill:#9aaab4;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 l 0,11 c 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2 L 0,0 Z"/></g><g transform="translate(29,2)" id="g28"><path id="path30" style="fill:#67757f;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 l 0,6 c 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2 L 0,0 Z"/></g><g transform="translate(13,2)" id="g32"><path id="path34" style="fill:#67757f;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 l 0,6 c 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2 L 0,0 Z"/></g><g transform="translate(29,18)" id="g36"><path id="path38" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -12,0 c -2.209,0 -4,1.791 -4,4 l 0,14 c 0,2.209 1.791,4 4,4 l 12,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><path id="path40" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 23,28 -8,0 0,8 8,0 0,-8 z"/><g transform="translate(11,21)" id="g42"><path id="path44" 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 -2,0 c -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 l 2,0 C -0.895,2 0,1.105 0,0"/></g><g transform="translate(33,21)" id="g46"><path id="path48" 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 -2,0 c -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 l 2,0 C -0.895,2 0,1.105 0,0"/></g><g transform="translate(29,13)" id="g50"><path id="path52" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.343,-3 -3,-3 l -14,0 c -1.657,0 -3,1.343 -3,3 0,1.657 1.343,3 3,3 L -3,3 C -1.343,3 0,1.657 0,0"/></g><path id="path54" style="fill:#2a6797;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 29,7 9,7 9,13 29,13 29,7 Z"/></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#9AAAB4" d="M11 27c0 1.104-.896 2-2 2s-2-.896-2-2V16c0-1.104.896-2 2-2s2 .896 2 2v11zm20 0c0 1.104-.896 2-2 2s-2-.896-2-2V16c0-1.104.896-2 2-2s2 .896 2 2v11z"/><path fill="#67757F" d="M29 34c0 1.104-.896 2-2 2s-2-.896-2-2v-6c0-1.104.896-2 2-2s2 .896 2 2v6zm-16 0c0 1.104-.896 2-2 2s-2-.896-2-2v-6c0-1.104.896-2 2-2s2 .896 2 2v6z"/><path fill="#4289C1" d="M29 18c0 2.209-1.791 4-4 4H13c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h12c2.209 0 4 1.791 4 4v14z"/><path fill="#E1E8ED" d="M15 0h8v8h-8z"/><path fill="#CCD6DD" d="M11 15c0 1.104-.896 2-2 2H7c-1.104 0-2-.896-2-2s.896-2 2-2h2c1.104 0 2 .896 2 2zm22 0c0 1.104-.896 2-2 2h-2c-1.104 0-2-.896-2-2s.896-2 2-2h2c1.104 0 2 .896 2 2z"/><path fill="#5DADEC" d="M29 23c0 1.657-1.343 3-3 3H12c-1.657 0-3-1.343-3-3s1.343-3 3-3h14c1.657 0 3 1.343 3 3z"/><path fill="#2A6797" d="M9 23h20v6H9z"/></svg>
\ No newline at end of file