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/1f1e6-1f1fd.svg b/public/emoji/1f1e6-1f1fd.svg
index 939ea37c7..03bc680c7 100644
--- a/public/emoji/1f1e6-1f1fd.svg
+++ b/public/emoji/1f1e6-1f1fd.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="clipPath36" clipPathUnits="userSpaceOnUse"><path id="path38" 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 transform="translate(16.0002,30.9996)" id="g12"><path id="path14" style="fill:#ffce00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-9 0,-2 20,0 0,2 -18,0 0,9 -2,0 z"/></g><g transform="translate(16.0002,16.0002)" id="g16"><path id="path18" style="fill:#ffce00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-2 0,-9 2,0 0,9 0.5,0 17.5,0 0,2 -20,0 z"/></g><g transform="translate(0,16.0002)" id="g20"><path id="path22" style="fill:#ffce00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-2 11,0 0,-9 2,0 0,9 0,2 -13,0 z"/></g><g transform="translate(10.9998,30.9996)" id="g24"><path id="path26" style="fill:#ffce00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-9 -11,0 0,-2 13,0 0,2 0,9 -2,0 z"/></g><g transform="translate(12.9996,30.9996)" id="g28"><path id="path30" style="fill:#d21034;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-11 -13,0 0,-3.999 13,0 0,-11 3.001,0 0,11 19.999,0 0,3.999 -19.999,0 0,11 L 0,0 Z"/></g><g id="g32"><g clip-path="url(#clipPath36)" id="g34"><g transform="translate(18,14)" id="g40"><path id="path42" style="fill:#0053a5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-9 14,0 c 2.209,0 4,1.791 4,4 L 18,0 0,0 Z"/></g><g transform="translate(0,14)" id="g44"><path id="path46" style="fill:#0053a5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-5 c 0,-2.209 1.791,-4 4,-4 l 7,0 0,9 -11,0 z"/></g><g transform="translate(11,31)" id="g48"><path id="path50" style="fill:#0053a5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -7,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-5 11,0 0,9 z"/></g><g transform="translate(32,31)" id="g52"><path id="path54" style="fill:#0053a5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -14,0 0,-9 18,0 0,5 C 4,-1.791 2.209,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCE00" d="M18 5h-2v11h20v-2H18zm-2 17v9h2v-9h18v-2H16zm-3-2H0v2h11v9h2v-9zm0-6V5h-2v9H0v2h13z"/><path fill="#D21034" d="M16 5h-3v11H0v4h13v11h3V20h20v-4H16z"/><path fill="#0053A5" d="M18 22v9h14c2.209 0 4-1.791 4-4v-5H18zM0 22v5c0 2.209 1.791 4 4 4h7v-9H0zM11 5H4C1.791 5 0 6.791 0 9v5h11V5zm21 0H18v9h18V9c0-2.209-1.791-4-4-4z"/></svg>
\ No newline at end of file