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/1f5fd.svg b/public/emoji/1f5fd.svg
index bbdd9f727..3191523a3 100644
--- a/public/emoji/1f5fd.svg
+++ b/public/emoji/1f5fd.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="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="M 4,36 C 4,36 0,36 0,32 L 0,32 0,4 C 0,0 4,0 4,0 l 0,0 28,0 c 4,0 4,4 4,4 l 0,0 0,28 c 0,0 0,4 -4,4 l 0,0 -28,0 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(36,4)" id="g20"><path id="path22" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0,-4 -4,-4 l -28,0 c 0,0 -4,0 -4,4 l 0,28 c 0,4 4,4 4,4 l 28,0 c 4,0 4,-4 4,-4 L 0,0 Z"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g transform="translate(3.1138,14)" id="g32"><path id="path34" style="fill:#157569;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1.483,0 C 1.206,-1.181 0.886,-2 0.886,-2 0.886,-2 0.514,-1.253 0,0 m 32.886,12 -7.181,-1.796 c -0.652,0.978 -1.438,1.855 -2.323,2.622 l 5.504,9.174 -2,0 -6.38,-7.292 c -1.162,0.56 -2.418,0.949 -3.741,1.141 L 15.886,22 l -2,0 -0.879,-6.151 C 11.709,15.661 10.476,15.283 9.331,14.74 L 3.886,22 l -2,0 4.561,-9.123 C 5.538,12.1 4.734,11.203 4.067,10.204 L -3.114,12 l 0,-2.001 5.819,-2.493 C 2.185,6.1 1.886,4.587 1.886,3 1.885,2.902 1.874,2.809 1.87,2.712 L -0.878,2.319 C -0.957,2.544 -1.035,2.763 -1.114,3 c -1,2.999 -2,4.999 -2,4.999 l -1,-24.999 33,3 c 0,0 -0.465,1.044 0,2 0.179,0.368 1.448,0.658 1,2 -0.709,2.129 -1.417,6.767 -1.769,10 l 4.769,0 0,2 -4.992,0.713 C 27.89,2.814 27.886,2.919 27.886,3 c 0,1.587 -0.299,3.1 -0.818,4.506 l 5.818,2.493 0,2.001 z"/></g><g transform="translate(7,18)" id="g36"><path id="path38" style="fill:#3fc9b9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0.422,3.316 4,5.999 8,9 10,8 10,7 10,6 7,6 4,4 1,2 0,0 0,0"/></g><g transform="translate(29,18)" id="g40"><path id="path42" style="fill:#3fc9b9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -0.423,3.316 -4,5.999 -8,9 -10,8 -10,7 -10,6 -7,6 -4,4 -1,2 0,0 0,0"/></g><g transform="translate(18,21.9995)" id="g44"><path id="path46" style="fill:#3fc9b9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -6,0 -8,-3.999 -8,-3.999 0,0 2,1.999 4,1.999 2,0 2,-1.999 2,-1.999 l 0,-2 c 0,-1 2,-1 2,-1 0,0 2,0 2,1 l 0,2 C 2,-3.999 2,-2 4,-2 6,-2 8,-3.999 8,-3.999 8,-3.999 6,0 0,0"/></g><g transform="translate(23,16)" id="g48"><path id="path50" style="fill:#3fc9b9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2,0 -2,1 -2,1 0,0 -0.083,-2.815 -1,-4 l -2,0 -2,0 c -0.918,1.185 -1,4 -1,4 0,0 0,-1 -2,-1 -2,0 -4,1 -4,1 0,0 0,-9 2,-10 1.265,-0.633 4,1 7,1 3,0 5.735,-1.633 7,-1 C 4,-8 4,1 4,1 4,1 2,0 0,0"/></g><g transform="translate(15,11)" id="g52"><path id="path54" style="fill:#157569;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 6,0 C 6,0 5,1 3,1 1,1 0,0 0,0"/></g><g transform="translate(2,13)" id="g56"><path id="path58" style="fill:#3fc9b9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 3,-7 6,-9 3,-2 9.583,-3 10.292,-5 0,0 -9.292,5 -11.292,2 -1.474,-2.211 -2,1 -2,2 0,1 0,4 -2,1 -0.785,-1.177 -2,4 -1,9"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#88C9F9" d="M36 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v28z"/><path fill="#157569" d="M26.496 9.174L32 0h-2l-6.38 7.292c-1.162-.559-2.418-.949-3.741-1.141L19 0h-2l-.879 6.151c-1.298.188-2.532.566-3.676 1.109L7 0H5l4.561 9.123c-.91.778-1.713 1.674-2.38 2.673L0 10v2l5.819 2.494C5.298 15.9 5 17.413 5 19c-.001.098-.013.191-.017.288l-2.748.393c-.078-.225-.156-.444-.235-.681-1-2.999-2-5-2-5v18c0 4 4 4 4 4h28s-.465-1.044 0-2c.179-.368 1.447-.658 1-2-.709-2.129-1.417-6.767-1.769-10H36v-2l-4.992-.713c-.004-.1-.008-.206-.008-.287 0-1.587-.299-3.1-.818-4.506L36 12v-2l-7.182 1.796c-.651-.978-1.437-1.855-2.322-2.622zM4 24s-.372-.747-.886-2h1.483C4.319 23.181 4 24 4 24z"/><path fill="#3FC9B9" d="M7 18s.422-3.316 4-6c4-3 6-2 6-1s-3 1-6 3-4 4-4 4zm22 0s-.423-3.316-4-6c-4-3-6-2.001-6-1 0 1 3 1 6 3s4 4 4 4zm-11-4c-6 0-8 4-8 4s2-2 4-2 2 2 2 2v2c0 1 2 1 2 1s2 0 2-1v-2s0-2 2-2 4 2 4 2-2-4-8-4z"/><path fill="#3FC9B9" d="M23 20c-2 0-2-1-2-1s-.083 2.815-1 4h-4c-.918-1.185-1-4-1-4s0 1-2 1-4-1-4-1 0 9 2 10c1.265.633 4-1 7-1s5.735 1.633 7 1c2-1 2-10 2-10s-2 1-4 1z"/><path fill="#157569" d="M15 25h6s-1-1-3-1-3 1-3 1z"/><path fill="#3FC9B9" d="M2 23c-1 5 .215 10.177 1 9 2-3 2 0 2 1s.526 4.211 2 2c1.401-2.101 6.368-.281 9.225 1h1.154C15.31 34.605 10.456 33.638 8 32c-3-2-6-9-6-9z"/></svg>
\ No newline at end of file