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/1f68c.svg b/public/emoji/1f68c.svg
index 8b5db4e4b..457516902 100644
--- a/public/emoji/1f68c.svg
+++ b/public/emoji/1f68c.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(0,15)" id="g20"><path id="path22" style="fill:#808285;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-7 c 0,-1.657 1.343,-3 3,-3 l 30,0 c 1.657,0 3,1.343 3,3 L 36,0 0,0 Z"/></g><g transform="translate(36,14)" id="g24"><path id="path26" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,9 c 0,1.657 -3.343,3 -5,3 l -20,0 c -8,0 -11,-2.343 -11,-4 l 0,-8 36,0 z"/></g><path id="path28" style="fill:#939598;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,11 -36,0 0,3 36,0 0,-3 z"/><g transform="translate(7.0005,11)" id="g30"><path id="path32" style="fill:#bcbec0;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -3.063,0 -5.586,-2.298 -5.95,-5.263 -5.425,-5.716 -4.749,-6 -4,-6 L 6,-6 C 6,-2.686 3.314,0 0,0"/></g><g transform="translate(34.9502,5.7373)" id="g34"><path id="path36" style="fill:#bcbec0;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.364,2.965 -2.887,5.263 -5.95,5.263 -3.314,0 -6,-2.687 -6,-6 l 10,0 c 0.749,0 1.425,0.284 1.95,0.737"/></g><g transform="translate(11,5)" id="g38"><path id="path40" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 2.209,0 4,-1.791 4,-4"/></g><g transform="translate(9,5)" id="g42"><path id="path44" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.896,-2 -2,-2 -1.104,0 -2,0.895 -2,2 0,1.105 0.896,2 2,2 1.104,0 2,-0.895 2,-2"/></g><g transform="translate(33,5)" id="g46"><path id="path48" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 2.209,0 4,-1.791 4,-4"/></g><g transform="translate(31,5)" id="g50"><path id="path52" style="fill:#99aab5;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 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2"/></g><path id="path54" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 1,9 0,9 0,11 1,11 1,9 Z"/><path id="path56" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,11 -1,0 0,2 1,0 0,-2 z"/><path id="path58" style="fill:#58595b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 36,13 1,13 1,23 36,23 36,13 Z"/><g transform="translate(2,23)" id="g60"><path id="path62" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1.658,0 C -1.89,-0.344 -2,-0.685 -2,-1 l 0,-11 2,0 c 1.104,0 2,0.896 2,2 l 0,8 C 2,-0.895 1.104,0 0,0"/></g><g transform="translate(31,16)" id="g64"><path id="path66" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -23,0 c -0.552,0 -1,0.447 -1,1 l 0,4 c 0,0.552 0.448,1 1,1 L -1,5 C -0.447,5 0,4.552 0,4 L 0,0 Z"/></g><path id="path68" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,17 -1,0 0,-2 1,0 0,2 z"/><g transform="translate(1,21)" id="g70"><path id="path72" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,0 0,-8 1,0 c 0.552,0 1,0.447 1,1 l 0,6 C 1,-0.448 0.552,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#808285" d="M0 21v7c0 1.657 1.343 3 3 3h30c1.657 0 3-1.343 3-3v-7H0z"/><path fill="#CCD6DD" d="M36 22v-9c0-1.657-3.343-3-5-3H11c-8 0-11 2.343-11 4v8h36z"/><path fill="#939598" d="M0 22h36v3H0z"/><path fill="#BCBEC0" d="M7 25c-3.063 0-5.586 2.298-5.95 5.263.526.453 1.202.737 1.95.737h10c0-3.313-2.686-6-6-6zm27.95 5.263C34.586 27.298 32.063 25 29 25c-3.313 0-6 2.687-6 6h10c.749 0 1.425-.284 1.95-.737z"/><circle cx="7" cy="31" r="4"/><circle fill="#99AAB5" cx="7" cy="31" r="2"/><circle cx="29" cy="31" r="4"/><circle fill="#99AAB5" cx="29" cy="31" r="2"/><path fill="#F4900C" d="M0 25h1v2H0zm35-2h1v2h-1z"/><path fill="#58595B" d="M1 13h35v10H1z"/><path fill="#292F33" d="M2 13H.342C.11 13.344 0 13.685 0 14v11h2c1.104 0 2-.896 2-2v-8c0-1.104-.896-2-2-2z"/><path fill="#55ACEE" d="M31 20c0 .553-.447 1-1 1H7c-.552 0-1-.447-1-1v-4c0-.552.448-1 1-1h23c.553 0 1 .448 1 1v4z"/><path fill="#FFAC33" d="M35 19h1v2h-1z"/><path fill="#55ACEE" d="M1 15H0v8h1c.552 0 1-.447 1-1v-6c0-.552-.448-1-1-1z"/></svg>
\ No newline at end of file