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/1f1ed-1f1f3.svg b/public/emoji/1f1ed-1f1f3.svg
index 9ffdb103c..298ec95af 100644
--- a/public/emoji/1f1ed-1f1f3.svg
+++ b/public/emoji/1f1ed-1f1f3.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="clipPath18" clipPathUnits="userSpaceOnUse"><path id="path20" 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"><path id="path12" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,14 36,0 0,7.999 -36,0 L 0,14 Z"/><g id="g14"><g clip-path="url(#clipPath18)" id="g16"><g transform="translate(32,31)" id="g22"><path id="path24" style="fill:#0156a3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -28,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-5 36,0 0,5 C 4,-1.791 2.209,0 0,0"/></g><g transform="translate(0,9)" id="g26"><path id="path28" style="fill:#0156a3;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 36,5 0,5 0,0 Z"/></g><g transform="translate(18.2646,18.2402)" id="g30"><path id="path32" style="fill:#2657a7;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.249,0.766 -0.498,0 -1.304,0 -0.652,-0.474 -0.901,-1.24 -0.249,-0.767 0.403,-1.24 0.154,-0.474 0.806,0 0,0 Z"/></g><g transform="translate(23.5971,15.7598)" id="g34"><path id="path36" style="fill:#2657a7;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.249,-0.766 0.403,-0.292 1.055,-0.766 0.806,0 1.458,0.474 0.652,0.474 0.403,1.24 0.154,0.474 -0.652,0.474 0,0 Z"/></g><g transform="translate(24.249,20.2402)" id="g38"><path id="path40" style="fill:#2657a7;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.249,0.766 -0.498,0 -1.304,0 -0.652,-0.474 -0.901,-1.24 -0.249,-0.767 0.403,-1.24 0.154,-0.474 0.806,0 0,0 Z"/></g><g transform="translate(11.542,15.7598)" id="g42"><path id="path44" style="fill:#2657a7;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.249,-0.766 0.403,-0.292 1.055,-0.766 0.806,0 1.458,0.474 0.652,0.474 0.403,1.24 0.154,0.474 -0.652,0.474 0,0 Z"/></g><g transform="translate(12.1938,20.2402)" id="g46"><path id="path48" style="fill:#2657a7;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.249,0.766 -0.498,0 -1.304,0 -0.652,-0.474 -0.901,-1.24 -0.249,-0.767 0.403,-1.24 0.154,-0.474 0.806,0 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="M0 14h36v8H0z"/><path fill="#0156A3" d="M32 5H4C1.791 5 0 6.791 0 9v5h36V9c0-2.209-1.791-4-4-4zM0 27c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4v-5H0v5z"/><path fill="#2657A7" d="M18.265 17.76l-.249-.766-.249.766h-.806l.652.473-.249.767.652-.474.652.474-.249-.767.652-.473zm5.332 2.48l-.249.766.652-.473.652.473-.249-.766.652-.473h-.806L24 19l-.249.767h-.806zm.652-4.48L24 14.994l-.249.766h-.806l.652.473-.249.767.652-.474.652.474-.249-.767.652-.473zm-12.707 4.48l-.249.766.652-.473.652.473-.249-.766.652-.473h-.806L11.945 19l-.249.767h-.806zm.652-4.48l-.249-.766-.249.766h-.806l.652.473-.249.767.652-.474.652.474-.249-.767.652-.473z"/></svg>
\ No newline at end of file