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/1f485-1f3fc.svg b/public/emoji/1f485-1f3fc.svg
index e20634f6c..af54b518a 100644
--- a/public/emoji/1f485-1f3fc.svg
+++ b/public/emoji/1f485-1f3fc.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(27,0)" id="g20"><path id="path22" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,4 C 0,4 0,8 4,8 8,8 8,4 8,4 L 8,0 0,0 Z"/></g><g transform="translate(18,0)" id="g24"><path id="path26" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,9 c 0,0 0,4 4,4 4,0 4,-4 4,-4 L 8,0 0,0 Z"/></g><g transform="translate(9,0)" id="g28"><path id="path30" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,12 c 0,0 0,4 4,4 4,0 4,-4 4,-4 L 8,0 0,0 Z"/></g><path id="path32" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,9 c 0,0 0,4 4,4 4,0 4,-4 4,-4 L 8,0 0,0 Z"/><g transform="translate(16.0005,12)" id="g34"><path id="path36" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.657 0,8 -3,8 -3,0 -3,-6.343 -3,-8 0,-1.657 1.343,-3 3,-3 1.657,0 3,1.343 3,3"/></g><g transform="translate(7.0005,9)" id="g38"><path id="path40" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.657 0,8 -3,8 -3,0 -3,-6.343 -3,-8 0,-1.657 1.343,-3 3,-3 1.657,0 3,1.343 3,3"/></g><g transform="translate(25,9)" id="g42"><path id="path44" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.657 0,8 -3,8 -3,0 -3,-6.343 -3,-8 0,-1.657 1.344,-3 3,-3 1.657,0 3,1.343 3,3"/></g><g transform="translate(34,4)" id="g46"><path id="path48" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.657 0,8 -3,8 -3,0 -3,-6.343 -3,-8 0,-1.657 1.344,-3 3,-3 1.657,0 3,1.343 3,3"/></g><g transform="translate(13,20)" id="g50"><path id="path52" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-4 2,0 c 0,0 2.001,0 6,4 L 6,2 C 6,2 4.001,0 0,0"/></g><g transform="translate(19,22)" id="g54"><path id="path56" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 8,8 10,6 2,-2 0,0 Z"/></g><g transform="translate(27,30)" id="g58"><path id="path60" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -2,2 0,4 L 2,6 9,6 9,1 6,-2 C 4,-4 2,-2 2,-2 L 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F3D2A2" d="M27 36v-4s0-4 4-4 4 4 4 4v4h-8zm-9 0v-9s0-4 4-4 4 4 4 4v9h-8zm-9 0V24s0-4 4-4 4 4 4 4v12H9zm-9 0v-9s0-4 4-4 4 4 4 4v9H0z"/><path fill="#DD2E44" d="M16 24c0-1.657 0-8-3-8s-3 6.343-3 8 1.343 3 3 3 3-1.343 3-3zm-9 3c0-1.657 0-8-3-8s-3 6.343-3 8 1.343 3 3 3 3-1.343 3-3zm18 0c0-1.657 0-8-3-8s-3 6.343-3 8 1.344 3 3 3c1.657 0 3-1.343 3-3zm9 5c0-1.657 0-8-3-8s-3 6.343-3 8 1.344 3 3 3c1.657 0 3-1.343 3-3z"/><path fill="#DD2E44" d="M13 16v4h2s2 0 6-4l-2-2s-2 2-6 2z"/><path fill="#8899A6" d="M19 14l8-8 2 2-8 8z"/><path fill="#8899A6" d="M27 6s-2-2 0-4l2-2h7v5l-3 3c-2 2-4 0-4 0l-2-2z"/></svg>
\ No newline at end of file