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/1f393.svg b/public/emoji/1f393.svg
index b3e6d83e1..6994aad09 100644
--- a/public/emoji/1f393.svg
+++ b/public/emoji/1f393.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><clipPath id="clipPath32" clipPathUnits="userSpaceOnUse"><path id="path34" d="m 0.963135,35.2479 34.074265,0 0,-26.60705 -34.074265,0 0,26.60705 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(24,22.0005)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5,0 -2,0 -5,0 c 0,0 -5,-6.001 -5,-10.001 0,-4 11,-11 11,-11 0,0 11,7 11,11 C 5,-6.001 0,0 0,0"/></g><g transform="translate(19.6396,34.7202)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.901,0.704 -2.377,0.704 -3.278,0 L -18,-11.497 c -0.902,-0.703 -0.902,-1.855 0,-2.559 l 14.721,-11.495 c 0.902,-0.704 2.377,-0.704 3.278,0 l 14.723,11.495 c 0.901,0.704 0.901,1.856 0,2.559 L 0,0 Z"/></g><g id="g28"><g id="g30"/><g id="g36"><g style="opacity:0.25" id="g38" clip-path="url(#clipPath32)"><g id="g40" transform="translate(19.6396,34.7202)"><path id="path42" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.901,0.704 -2.377,0.704 -3.278,0 L -18,-11.497 c -0.902,-0.703 -0.902,-1.855 0,-2.559 l 14.721,-11.495 c 0.902,-0.704 2.377,-0.704 3.278,0 l 14.723,11.495 c 0.901,0.704 0.901,1.856 0,2.559 L 0,0 Z"/></g></g></g></g><g transform="translate(8,11)" id="g44"><path id="path46" style="fill:#fcab40;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -2,-2 -2,-3 l 0,-6 c 0,0 0,-2 2,-2 2,0 2,2 2,2 l 0,6 C 2,-2 0,0 0,0"/></g><g transform="translate(11.0005,10)" id="g48"><path id="path50" style="fill:#fdd888;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.658 -1.343,-3 -3,-3 -1.657,0 -3,1.342 -3,3 0,1.658 1.343,3 3,3 1.657,0 3,-1.342 3,-3"/></g><g transform="translate(8.0015,9)" id="g52"><path id="path54" style="fill:#fcab40;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.447 -1,1 l 0,3.958 c -0.042,0.634 0.187,2.036 1.317,2.884 l 9.022,7.91 c 0.416,0.365 1.048,0.323 1.412,-0.093 0.364,-0.415 0.322,-1.047 -0.093,-1.411 L 1.576,6.29 C 0.973,5.834 0.999,5.018 0.999,5.01 L 1,1 C 1,0.447 0.552,0 0,0"/></g><g transform="translate(21,23)" id="g56"><path id="path58" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.343,-3 -3,-3 -1.657,0 -3,1.343 -3,3 0,1.657 1.343,3 3,3 1.657,0 3,-1.343 3,-3"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M24 14H12s-5 6-5 10 11 11 11 11 11-7 11-11-5-10-5-10z"/><path fill="#292F33" d="M19.64 1.28c-.901-.704-2.377-.704-3.278 0L1.639 12.776c-.901.704-.901 1.856 0 2.56l14.722 11.495c.902.704 2.377.704 3.278 0l14.722-11.495c.902-.704.902-1.856 0-2.56L19.64 1.28z"/><path fill="#394146" d="M19.64 1.28c-.901-.704-2.377-.704-3.278 0L1.639 12.776c-.901.704-.901 1.856 0 2.56l14.722 11.495c.901.704 2.377.704 3.278 0l14.723-11.495c.901-.704.901-1.856 0-2.56L19.64 1.28z"/><path fill="#FCAB40" d="M8 25s-2 2-2 3v6s0 2 2 2 2-2 2-2v-6c0-1-2-3-2-3z"/><circle fill="#FDD888" cx="8" cy="26" r="3"/><path fill="#FCAB40" d="M8.001 27c-.552 0-1-.447-1-1v-3.958c-.042-.634.187-2.036 1.317-2.884l9.022-7.91c.416-.365 1.048-.323 1.411.093.364.415.322 1.047-.093 1.411l-9.08 7.958C8.974 21.166 9 21.982 9 21.99L9.002 26c0 .553-.448 1-1.001 1z"/><circle fill="#292F33" cx="18" cy="13" r="3"/></svg>
\ No newline at end of file