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/2649.svg b/public/emoji/2649.svg
index eca8d4a54..6e9918a3b 100644
--- a/public/emoji/2649.svg
+++ b/public/emoji/2649.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(36,4)" id="g20"><path id="path22" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -28,0 c -2.209,0 -4,1.791 -4,4 l 0,28 c 0,2.209 1.791,4 4,4 l 28,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(18,20.5)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.033,0 -5.5,-2.467 -5.5,-5.5 0,-3.032 2.467,-5.5 5.5,-5.5 3.032,0 5.5,2.468 5.5,5.5 C 5.5,-2.467 3.032,0 0,0 m 0,-14 c -4.687,0 -8.5,3.814 -8.5,8.5 C -8.5,-0.813 -4.687,3 0,3 4.687,3 8.5,-0.813 8.5,-5.5 8.5,-10.186 4.687,-14 0,-14"/></g><g transform="translate(18,20.5)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -5.109,0 -7.58,2.79 -8.131,3.507 -8.612,3.957 -9.947,5 -11,5 c -1.297,0 -1.94,-0.563 -1.967,-0.587 -0.603,-0.543 -1.547,-0.519 -2.106,0.07 -0.559,0.59 -0.562,1.503 0.012,2.078 C -14.914,6.708 -13.548,8 -11,8 -8.452,8 -6.189,5.811 -5.939,5.561 -5.87,5.491 -5.807,5.414 -5.752,5.332 -5.695,5.251 -4.062,3 0,3 4.083,3 5.736,5.309 5.752,5.332 5.807,5.414 5.869,5.491 5.939,5.561 6.189,5.811 8.452,8 11,8 c 2.548,0 3.913,-1.292 4.061,-1.439 0.585,-0.586 0.585,-1.536 0,-2.122 -0.586,-0.585 -1.536,-0.585 -2.122,0 C 12.938,4.439 12.295,5 11,5 9.948,5 8.616,3.96 8.131,3.506 7.579,2.789 5.107,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#9266CC" d="M36 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v28z"/><g fill="#FFF"><path d="M18 29.5c-4.687 0-8.5-3.813-8.5-8.5 0-4.687 3.813-8.5 8.5-8.5 4.687 0 8.5 3.813 8.5 8.5 0 4.687-3.813 8.5-8.5 8.5zm0-14c-3.033 0-5.5 2.467-5.5 5.5 0 3.032 2.467 5.5 5.5 5.5 3.032 0 5.5-2.468 5.5-5.5 0-3.033-2.468-5.5-5.5-5.5z"/><path d="M18 15.5c-5.109 0-7.58-2.79-8.131-3.507C9.388 11.543 8.053 10.5 7 10.5c-1.297 0-1.94.563-1.967.587-.604.543-1.547.519-2.106-.07-.559-.59-.562-1.503.013-2.077C3.086 8.792 4.452 7.5 7 7.5s4.811 2.189 5.061 2.439c.07.07.133.146.188.229.057.08 1.69 2.332 5.752 2.332 4.083 0 5.736-2.309 5.752-2.332.055-.082.117-.159.188-.229C24.19 9.689 26.452 7.5 29 7.5s3.913 1.292 4.061 1.439c.586.585.586 1.536 0 2.121-.586.586-1.535.586-2.121 0-.002 0-.645-.561-1.94-.561-1.052 0-2.384 1.04-2.869 1.494-.552.718-3.024 3.507-8.131 3.507z"/></g></svg>
\ No newline at end of file