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/1f506.svg b/public/emoji/1f506.svg
index 251d4ffa7..2a2d58ca4 100644
--- a/public/emoji/1f506.svg
+++ b/public/emoji/1f506.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(20,30)" id="g20"><path id="path22" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 -1.104,0 -2,0.896 -2,2 l 0,4 c 0,1.104 0.896,2 2,2 1.105,0 2,-0.896 2,-2 L 0,0 Z"/></g><g transform="translate(20,2)" id="g24"><path id="path26" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.895,-2 -2,-2 -1.104,0 -2,0.895 -2,2 l 0,4 c 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2 L 0,0 Z"/></g><g transform="translate(6,20)" id="g28"><path id="path30" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.104,0 2,-0.895 2,-2 2,-3.104 1.104,-4 0,-4 l -4,0 c -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 l 4,0 z"/></g><g transform="translate(34,20)" id="g32"><path id="path34" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.105,0 2,-0.895 2,-2 2,-3.104 1.105,-4 0,-4 l -4,0 c -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 l 4,0 z"/></g><g transform="translate(8.1006,10.9287)" id="g36"><path id="path38" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.781,0.78 2.047,0.781 2.828,0 0.781,-0.78 0.781,-2.048 0,-2.828 L 0,-5.657 c -0.781,-0.78 -2.048,-0.78 -2.828,0 -0.781,0.781 -0.781,2.048 0,2.828 L 0,0 Z"/></g><g transform="translate(27.8994,30.7275)" id="g40"><path id="path42" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.781,0.781 2.047,0.782 2.828,0 0.781,-0.78 0.781,-2.047 0,-2.828 L 0,-5.656 c -0.781,-0.782 -2.048,-0.782 -2.828,-0.001 -0.781,0.782 -0.781,2.048 0,2.829 L 0,0 Z"/></g><g transform="translate(25.0713,8.1006)" id="g44"><path id="path46" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.78,0.781 -0.781,2.047 0,2.828 0.78,0.781 2.048,0.781 2.828,0 L 5.657,0 c 0.78,-0.781 0.78,-2.048 0,-2.828 -0.781,-0.781 -2.048,-0.781 -2.828,0 L 0,0 Z"/></g><g transform="translate(18,13)" id="g48"><path id="path50" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.761,0 -5,2.238 -5,4.999 0,2.762 2.239,5 5,5 2.762,0 5,-2.238 5,-5 C 5,2.238 2.762,0 0,0 M 0,14 C -4.971,14 -9,9.97 -9,4.999 -9,0.029 -4.971,-4 0,-4 4.971,-4 9,0.029 9,4.999 9,9.97 4.971,14 0,14"/></g><g transform="translate(5.2725,27.8994)" id="g52"><path id="path54" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.781,0.781 -0.782,2.047 0,2.828 0.78,0.781 2.047,0.781 2.828,0 L 5.656,0 c 0.782,-0.781 0.782,-2.048 0.001,-2.828 -0.782,-0.781 -2.048,-0.781 -2.829,0 L 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFAC33" d="M20 6c0 1.104-.896 2-2 2s-2-.896-2-2V2c0-1.104.896-2 2-2s2 .896 2 2v4zm0 28c0 1.104-.896 2-2 2s-2-.896-2-2v-4c0-1.104.896-2 2-2s2 .896 2 2v4zM6 16c1.104 0 2 .896 2 2s-.896 2-2 2H2c-1.104 0-2-.896-2-2s.896-2 2-2h4zm28 0c1.104 0 2 .896 2 2s-.896 2-2 2h-4c-1.104 0-2-.896-2-2s.896-2 2-2h4zM8.101 25.071c.781-.78 2.047-.781 2.828 0 .781.78.781 2.048 0 2.828l-2.828 2.829c-.781.78-2.048.78-2.828 0-.781-.781-.781-2.048 0-2.828l2.828-2.829zM27.899 5.272c.781-.781 2.047-.782 2.828 0 .781.781.781 2.047 0 2.829l-2.828 2.828c-.781.781-2.048.781-2.828 0-.781-.781-.781-2.047 0-2.829l2.828-2.828zm-2.828 22.627c-.78-.781-.781-2.047 0-2.828.78-.781 2.048-.781 2.828 0l2.829 2.828c.78.781.78 2.048 0 2.828-.781.781-2.048.781-2.828 0l-2.829-2.828zM18 9c-4.971 0-9 4.029-9 9 0 4.97 4.029 9 9 9s9-4.029 9-9c0-4.97-4.029-9-9-9zm0 14c-2.761 0-5-2.238-5-5s2.239-5 5-5c2.762 0 5 2.239 5 5s-2.238 5-5 5zM5.272 8.101c-.781-.781-.782-2.047 0-2.828.781-.781 2.047-.781 2.829 0l2.828 2.828c.781.781.781 2.048 0 2.828-.781.781-2.047.781-2.829 0L5.272 8.101z"/></svg>
\ No newline at end of file