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/1f3e8.svg b/public/emoji/1f3e8.svg
index 667bffaf7..2d67b9a9c 100644
--- a/public/emoji/1f3e8.svg
+++ b/public/emoji/1f3e8.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(21,21)" id="g20"><path id="path22" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -13,0 c -2.209,0 -4,1.791 -4,4 l 0,3 c 0,2.209 1.791,4 4,4 L -4,7 C -1.791,7 0,5.209 0,3 L 0,0 Z"/></g><g transform="translate(36,30)" id="g24"><path id="path26" style="fill:#c1694f;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,1 c 0,2.209 1.791,4 4,4 L -4,5 C -1.791,5 0,3.209 0,1 L 0,0 Z"/></g><g transform="translate(0,24)" id="g28"><path id="path30" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-22 c 0,-1.105 0.896,-2 2,-2 l 31,0 0,24 -33,0 z"/></g><path id="path32" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 14,0 2,0 2,4 14,4 14,0 Z"/><path id="path34" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 18,6 2,6 2,10 18,10 18,6 Z"/><g transform="translate(16,31)" id="g36"><path id="path38" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-31 18,0 c 1.105,0 2,0.895 2,2 L 20,0 0,0 Z"/></g><path id="path40" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 34,12 -16,0 0,4 16,0 0,-4 z"/><path id="path42" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 34,18 -16,0 0,4 16,0 0,-4 z"/><path id="path44" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 34,24 -16,0 0,4 16,0 0,-4 z"/><path id="path46" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 34,6 -16,0 0,4 16,0 0,-4 z"/><path id="path48" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 24,5 -2,0 0,24 2,0 0,-24 z"/><path id="path50" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 30,5 -2,0 0,24 2,0 0,-24 z"/><path id="path52" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 30,0 -8,0 0,4 8,0 0,-4 z"/><g transform="translate(10,22)" id="g54"><path id="path56" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-4 -4,0 0,4 -2,0 0,-10 2,0 0,4 4,0 0,-4 2,0 0,10 -2,0 z"/></g><path id="path58" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 9,5 7,5 7,11 9,11 9,5 Z"/><path id="path60" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16,5 -2,0 0,6 2,0 0,-6 z"/></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#C1694F" d="M21 15c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4v-3c0-2.209 1.791-4 4-4h13c2.209 0 4 1.791 4 4v3z"/><path fill="#C1694F" d="M36 6c0 2.209-1.791 4-4 4H20c-2.209 0-4-1.791-4-4V5c0-2.209 1.791-4 4-4h12c2.209 0 4 1.791 4 4v1z"/><path fill="#FFCC4D" d="M0 12v22c0 1.104.896 2 2 2h31V12H0z"/><path fill="#55ACEE" d="M2 32h12v4H2zm0-6h16v4H2z"/><path fill="#FFE8B6" d="M16 5v31h18c1.104 0 2-.896 2-2V5H16z"/><path fill="#55ACEE" d="M18 20h16v4H18zm0-6h16v4H18zm0-6h16v4H18zm0 18h16v4H18z"/><path fill="#FFE8B6" d="M22 7h2v24h-2zm6 0h2v24h-2z"/><path fill="#3B88C3" d="M22 32h8v4h-8zM10 14v4H6v-4H4v10h2v-4h4v4h2V14z"/><path fill="#FFCC4D" d="M7 25h2v6H7zm7 0h2v6h-2z"/></svg>
\ No newline at end of file