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/1f4d3.svg b/public/emoji/1f4d3.svg
index 65c7642c2..b6f49c051 100644
--- a/public/emoji/1f4d3.svg
+++ b/public/emoji/1f4d3.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="clipPath48" clipPathUnits="userSpaceOnUse"><path id="path50" d="M 7,28 7,0 25,0 c 2.209,0 4,1.791 4,4 l 0,0 0,20.335 C 29,26.545 27.544,28 25.335,28 l 0,0 L 7,28 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(35,10)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -26,0 c -2.209,0 -4,1.791 -4,4 l 0,19.687 c 0,2.209 5.791,6.313 8,6.313 l 20.625,0 C -2.281,26 0,23.687 0,20.625 L 0,0 Z"/></g><g transform="translate(33,6)" id="g24"><path id="path26" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -22,0 c -2.209,0 -4,1.791 -4,4 l 0,24 c 0,4.119 -0.021,4 5,4 l 21,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(31,5)" id="g28"><path id="path30" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.343,-3 -3,-3 l -24,0 c -1.657,0 -3,1.343 -3,3 l 0,24 c 0,1.657 1.343,3 3,3 l 24,0 c 1.657,0 3,-1.343 3,-3 L 0,0 Z"/></g><g transform="translate(31,4)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -21,0 c -2.209,0 -4,1.791 -4,4 l 0,22 c 0,2.209 1.791,4 4,4 l 21,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(29,4)" id="g36"><path id="path38" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -19,0 c -2.209,0 -4,1.791 -4,4 l 0,20 c 0,2.209 1.791,4 4,4 l 19.335,0 C -1.456,24 0,22.544 0,20.335 L 0,0 Z"/></g><g transform="translate(6,30)" id="g40"><path id="path42" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.687,0 -1.731,1.922 -1,2.75 -0.168,3.691 1.125,4 3.438,4 L 5,4 5,6 2.281,6 C -1.687,6 -5,3.5 -5,0.625 L -5,-26 c 0,-2.209 1.791,-4 4,-4 l 2,0 0,30 -1,0 z"/></g></g></g><g id="g44"><g clip-path="url(#clipPath48)" id="g46"><path id="path52" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 10,24 -4,0 0,4 4,0 0,-4 z"/><path id="path54" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 18,24 -4,0 0,4 4,0 0,-4 z"/><path id="path56" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26,24 -4,0 0,4 4,0 0,-4 z"/><path id="path58" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 22,20 -4,0 0,4 4,0 0,-4 z"/><path id="path60" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 30,20 -4,0 0,4 4,0 0,-4 z"/><path id="path62" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 14,20 -4,0 0,4 4,0 0,-4 z"/><path id="path64" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 10,16 -4,0 0,4 4,0 0,-4 z"/><path id="path66" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 18,16 -4,0 0,4 4,0 0,-4 z"/><path id="path68" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26,16 -4,0 0,4 4,0 0,-4 z"/><path id="path70" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 22,12 -4,0 0,4 4,0 0,-4 z"/><path id="path72" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 30,12 -4,0 0,4 4,0 0,-4 z"/><path id="path74" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 14,12 -4,0 0,4 4,0 0,-4 z"/><path id="path76" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 10,8 -4,0 0,4 4,0 0,-4 z"/><path id="path78" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 18,8 -4,0 0,4 4,0 0,-4 z"/><path id="path80" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26,8 -4,0 0,4 4,0 0,-4 z"/><path id="path82" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 10,0 6,0 6,4 10,4 10,0 Z"/><path id="path84" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 18,0 -4,0 0,4 4,0 0,-4 z"/><path id="path86" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26,0 -4,0 0,4 4,0 0,-4 z"/><path id="path88" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 22,4 -4,0 0,4 4,0 0,-4 z"/><path id="path90" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 30,4 -4,0 0,4 4,0 0,-4 z"/><path id="path92" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 14,4 -4,0 0,4 4,0 0,-4 z"/></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M35 26c0 2.209-1.791 4-4 4H5c-2.209 0-4-1.791-4-4V6.313C1 4.104 6.791 0 9 0h20.625C32.719 0 35 2.312 35 5.375V26z"/><path fill="#CCD6DD" d="M33 30c0 2.209-1.791 4-4 4H7c-2.209 0-4-1.791-4-4V6c0-4.119-.021-4 5-4h21c2.209 0 4 1.791 4 4v24z"/><path fill="#E1E8ED" d="M31 31c0 1.657-1.343 3-3 3H4c-1.657 0-3-1.343-3-3V7c0-1.657 1.343-3 3-3h24c1.657 0 3 1.343 3 3v24z"/><path fill="#292F33" d="M31 32c0 2.209-1.791 4-4 4H6c-2.209 0-4-1.791-4-4V10c0-2.209 1.791-4 4-4h21c2.209 0 4 1.791 4 4v22z"/><path fill="#66757F" d="M29 32c0 2.209-1.791 4-4 4H6c-2.209 0-4-1.791-4-4V12c0-2.209 1.791-4 4-4h19.335C27.544 8 29 9.456 29 11.665V32z"/><path fill="#292F33" d="M6 6C4.312 6 4.269 4.078 5 3.25 5.832 2.309 7.125 2 9.438 2H11V0H8.281C4.312 0 1 2.5 1 5.375V32c0 2.209 1.791 4 4 4h2V6H6z"/><path d="M7 8h3v4H7zm7 0h4v4h-4zm12 .056c-.214-.031-.433-.056-.665-.056H22v4h4V8.056zM18 12h4v4h-4zm8 0h3v4h-3zm-16 0h4v4h-4zm-3 4h3v4H7zm7 0h4v4h-4zm8 0h4v4h-4zm-4 4h4v4h-4zm8 0h3v4h-3zm-16 0h4v4h-4zm-3 4h3v4H7zm7 0h4v4h-4zm8 0h4v4h-4zM7 32h3v4H7zm7 0h4v4h-4zm8 4h3c.347 0 .679-.058 1-.141V32h-4v4zm-4-8h4v4h-4zm8 0h3v4h-3zm-16 0h4v4h-4z" fill="#CCD6DD"/></svg>
\ No newline at end of file