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/1f1f9-1f1fb.svg b/public/emoji/1f1f9-1f1fb.svg
index 1a3d48f7e..6558df605 100644
--- a/public/emoji/1f1f9-1f1fb.svg
+++ b/public/emoji/1f1f9-1f1fb.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 4,31 C 1.791,31 0,29.209 0,27 L 0,27 0,9 C 0,6.791 1.791,5 4,5 l 0,0 28,0 c 2.209,0 4,1.791 4,4 l 0,0 0,18 c 0,2.209 -1.791,4 -4,4 l 0,0 -28,0 z"/></clipPath><clipPath id="clipPath72" clipPathUnits="userSpaceOnUse"><path id="path74" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath108" clipPathUnits="userSpaceOnUse"><path id="path110" d="M 4,31 C 1.791,31 0,29.209 0,27 l 0,0 0,-9 19,0 0,13 -15,0 z"/></clipPath><clipPath id="clipPath124" clipPathUnits="userSpaceOnUse"><path id="path126" 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(22,20.5)" id="g20"><path id="path22" style="fill:#00247d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,0 0,0 Z"/></g><g transform="translate(22,31)" id="g24"><path id="path26" style="fill:#00247d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,0 0,0 Z"/></g><g transform="translate(21.0621,31)" id="g28"><path id="path30" style="fill:#5b97b1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.062,0 -20.969,0 0,-10.5 -0.031,0 0.031,-15.5 35.969,0 0,26 L 0,0 Z"/></g><g transform="translate(13.5984,8.2276)" id="g32"><path id="path34" style="fill:#ffce00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.487,1.5 -0.974,0 -2.551,0 -1.276,-0.927 -1.763,-2.426 -0.487,-1.5 0.788,-2.426 0.301,-0.927 1.577,0 0,0 Z"/></g><g transform="translate(20.0826,9.3938)" id="g36"><path id="path38" style="fill:#ffce00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.487,1.5 -0.788,0.573 -2.064,1.5 -1.577,0 l -1.275,-0.927 1.576,0 0.488,-1.499 0.487,1.499 1.577,0 L 0,0 Z"/></g><g transform="translate(20.5699,16.1793)" id="g40"><path id="path42" style="fill:#ffce00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1.276,-0.927 -2.551,0 l 0.487,-1.5 -1.276,-0.926 1.577,0 0.487,-1.5 0.488,1.5 1.576,0 L -0.487,-1.5 0,0 Z"/></g><g transform="translate(25.0428,10.7298)" id="g44"><path id="path46" style="fill:#ffce00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.487,1.5 -0.788,0.573 -2.064,1.5 -1.577,0 l -1.275,-0.927 1.576,0 0.488,-1.499 0.487,1.499 1.577,0 L 0,0 Z"/></g><g transform="translate(23.7672,21.3043)" id="g48"><path id="path50" style="fill:#ffce00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.487,-1.5 0.974,0 2.551,0 1.276,0.927 1.763,2.426 0.487,1.5 -0.788,2.426 -0.301,0.927 -1.577,0 0,0 Z"/></g><g transform="translate(28.3129,14.7686)" id="g52"><path id="path54" style="fill:#ffce00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.487,1.5 -0.974,0 -2.551,0 -1.276,-0.927 -1.763,-2.426 -0.487,-1.5 0.788,-2.426 0.301,-0.927 1.577,0 0,0 Z"/></g><g transform="translate(28.3561,22.8727)" id="g56"><path id="path58" style="fill:#ffce00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.487,-1.5 0.974,0 2.551,0 1.276,0.927 1.763,2.426 0.487,1.5 -0.788,2.426 -0.301,0.927 -1.577,0 0,0 Z"/></g><g transform="translate(32.9233,17.7366)" id="g60"><path id="path62" style="fill:#ffce00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.487,1.5 -0.974,0 -2.551,0 -1.276,-0.927 -1.763,-2.426 -0.487,-1.5 0.788,-2.426 0.301,-0.927 1.577,0 0,0 Z"/></g><g transform="translate(31.6477,26.9528)" id="g64"><path id="path66" style="fill:#ffce00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.487,-1.5 0.788,-0.573 2.064,-1.5 1.577,0 2.852,0.927 1.276,0.927 0.788,2.426 0.301,0.927 -1.276,0.927 0,0 Z"/></g></g></g><g id="g68"><g clip-path="url(#clipPath72)" id="g70"><g transform="translate(19,31)" id="g76"><path id="path78" style="fill:#00247d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -15,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-9 19,0 0,13 z"/></g><g transform="translate(19,18)" id="g80"><path id="path82" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,2.029 -7.1,7 -12.329,7 -2.332,0 0,0 Z"/></g><g transform="translate(19,19.418)" id="g84"><path id="path86" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -7.971,5.582 -1.743,0 L 0,-1.22 0,0 Z"/></g><g transform="translate(8.0996,25)" id="g88"><path id="path90" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -8.1,-5.766 -8.1,-7 -4.768,-7 5.23,0 0,0 Z"/></g><g transform="translate(10.7139,25)" id="g92"><path id="path94" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -9.98,-7 0.266,0 1.461,0 L 1.744,0 0,0 Z"/></g><g transform="translate(16.6689,31)" id="g96"><path id="path98" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -9.997,-7 5.229,0 7.099,4.97 0,2.03 L 0,0 Z"/></g><g transform="translate(17.5391,31)" id="g100"><path id="path102" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -9.997,-7 1.744,0 9.714,6.802 L 1.461,0 0,0 Z"/></g></g></g><g id="g104"><g clip-path="url(#clipPath108)" id="g106"><g transform="translate(10,24)" id="g112"><path id="path114" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 3.329,0 -6.668,7 -9,7 -9.625,5.406 0,-1.331 0,0 Z"/></g><g transform="translate(10,24)" id="g116"><path id="path118" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.714,0 -9,6.802 -9.5,5.937 0,-0.722 0,0 Z"/></g></g></g><g id="g120"><g clip-path="url(#clipPath124)" id="g122"><g transform="translate(19,27)" id="g128"><path id="path130" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -7,0 0,4 -5,0 0,-4 -7,0 0,-5 7,0 0,-4 5,0 0,4 7,0 0,5 z"/></g><path id="path132" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 11,18 -3,0 0,13 3,0 0,-13 z"/><path id="path134" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 19,23 -19,0 0,3 19,0 0,-3 z"/></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#5B97B1" d="M32 5H4c-.205 0-.407.015-.604.045l-.004 1.754-2.73-.004C.244 7.427 0 8.185 0 9v18c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4V9c0-2.209-1.791-4-4-4z"/><path d="M13.598 27.772l-.487-1.499-.487 1.499h-1.577l1.276.927-.487 1.5 1.275-.927 1.276.927-.487-1.5 1.275-.927zm6.485-1.166l.487-1.499-1.276.926-1.275-.926.487 1.499-1.276.927h1.577l.487 1.5.487-1.5h1.577zm.487-6.785l-1.276.926-1.275-.926.487 1.499-1.276.927h1.577l.487 1.5.487-1.5h1.577l-1.275-.927zm4.473 5.449l.487-1.499-1.276.926-1.275-.926.487 1.499-1.276.927h1.577l.487 1.499.488-1.499h1.576zm-1.276-10.574l.487 1.499.488-1.499h1.576l-1.275-.927.487-1.5-1.276.927-1.275-.927.487 1.5-1.276.927zm4.546 6.535l-.487-1.499-.488 1.499h-1.576l1.275.927-.487 1.5 1.276-.927 1.275.927-.487-1.5 1.276-.927zm.043-8.104l.487 1.5.488-1.5h1.576l-1.275-.926.487-1.5-1.276.927-1.275-.927.487 1.5-1.276.926zm4.567 5.136l-.487-1.499-.487 1.499h-1.577l1.276.927-.488 1.5 1.276-.927 1.276.927-.488-1.5 1.276-.927zm-1.275-9.216l-.488 1.5 1.276-.927 1.276.927-.488-1.5L34.5 8.12h-1.577l-.487-1.499-.487 1.499h-1.577z" fill="#FFCE00"/><path fill="#00247D" d="M19 18V5H4c-.32 0-.604.045-.604.045l-.004 1.754-2.73-.004S.62 6.854.535 7C.195 7.589 0 8.272 0 9v9h19z"/><path fill="#EEE" d="M19 5h-2.331L12 8.269V5H7v2.569L3.396 5.045c-.614.094-1.19.325-1.672.665L6.426 9H4.69L.967 6.391c-.11.129-.211.262-.305.404L3.813 9H0v5h3.885L0 16.766V18h3.332L7 15.432V18h5v-3.269L16.668 18H19v-2.029L16.185 14H19V9h-2.814L19 7.029V5z"/><path fill="#CF1B2B" d="M11 8.969V5H8v5H0v3h8v5h3v-5h8v-3h-8z"/><path fill="#CF1B2B" d="M19 5h-1.461L12 8.879V9h1.571L19 5.198zm-17.276.71c-.281.195-.534.423-.757.681L4.69 9h1.735L1.724 5.71zM6.437 14L.734 18h1.727L7 14.822V14zM19 17.802v-1.22L15.313 14H13.57z"/><path fill="#00247D" d="M19 18V5H4c-.32 0-.604.045-.604.045l-.004 1.754-2.73-.004S.62 6.854.535 7C.195 7.589 0 8.272 0 9v9h19z"/><path fill="#EEE" d="M19 5h-2.331L12 8.269V5H7v2.569L3.396 5.045c-.614.094-1.19.325-1.672.665L6.426 9H4.69L.967 6.391c-.11.129-.211.262-.305.404L3.813 9H0v5h3.885L0 16.766V18h3.332L7 15.432V18h5v-3.269L16.668 18H19v-2.029L16.185 14H19V9h-2.814L19 7.029V5z"/><path fill="#CF1B2B" d="M11 5H8v5H0v3h8v5h3v-5h8v-3h-8z"/><path fill="#CF1B2B" d="M19 5h-1.461L12 8.879V9h1.571L19 5.198zm-17.276.71c-.281.195-.534.423-.757.681L4.69 9h1.735L1.724 5.71zM6.437 14L.734 18h1.727L7 14.822V14zM19 17.802v-1.22L15.313 14H13.57z"/></svg>
\ No newline at end of file