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/1f1eb-1f1f4.svg b/public/emoji/1f1eb-1f1f4.svg
index c1fd7e977..93a127285 100644
--- a/public/emoji/1f1eb-1f1f4.svg
+++ b/public/emoji/1f1eb-1f1f4.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(9.4445,31)" id="g20"><path id="path22" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5.444,0 c -2.21,0 -4,-1.791 -4,-4 l 0,-5.5 L 0,-9.5 0,0 Z"/></g><g transform="translate(36,21.5)" id="g24"><path id="path26" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,5.5 c 0,2.209 -1.791,4 -4,4 l -15.5,0 0,-9.5 L 0,0 Z"/></g><g transform="translate(36,20)" id="g28"><path id="path30" style="fill:#0065bd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,1.5 -19.5,0 0,9.5 -1.5,0 0,-11 21,0 z"/></g><g transform="translate(11,31)" id="g32"><path id="path34" style="fill:#0065bd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.556,0 0,-9.5 -9.444,0 0,-1.5 11,0 0,11 z"/></g><g transform="translate(0,14.5)" id="g36"><path id="path38" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,-2.021 0,-4.562 0,-5.5 c 0,-2.209 1.791,-4 4,-4 l 5.444,0 0,4.938 0,2.541 L 9.444,0 0,0 Z"/></g><g transform="translate(16.5,14.5)" id="g40"><path id="path42" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-9.5 15.5,0 c 2.209,0 4,1.791 4,4 L 19.5,0 0,0 Z"/></g><g transform="translate(15,20)" id="g44"><path id="path46" style="fill:#ed2939;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,11 -4,0 0,-11 -11,0 0,-4 11,0 0,-11 4,0 0,11 21,0 0,4 -21,0 z"/></g><g transform="translate(15,16)" id="g48"><path id="path50" style="fill:#0065bd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-11 1.5,0 0,9.5 19.5,0 L 21,0 0,0 Z"/></g><g transform="translate(11,16)" id="g52"><path id="path54" style="fill:#0065bd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -11,0 0,-1.5 9.444,0 0,-9.5 L 0,-11 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#EEE" d="M9.444 5H4C1.791 5 0 6.791 0 9v5.5h9.444V5zM36 14.5V9c0-2.209-1.791-4-4-4H16.5v9.5H36z"/><path fill="#0065BD" d="M36 16v-1.5H16.5V5H15v11zM11 5H9.444v9.5H0V16h11z"/><path fill="#EEE" d="M0 21.5V27c0 2.209 1.791 4 4 4h5.444v-9.5H0zm16.5 0V31H32c2.209 0 4-1.791 4-4v-5.5H16.5z"/><path fill="#ED2939" d="M15 16V5h-4v11H0v4h11v11h4V20h21v-4z"/><path fill="#0065BD" d="M15 20v11h1.5v-9.5H36V20zm-4 0H0v1.5h9.444V31H11z"/></svg>
\ No newline at end of file