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/1f687.svg b/public/emoji/1f687.svg
index 60c3d8268..acd11bd4e 100644
--- a/public/emoji/1f687.svg
+++ b/public/emoji/1f687.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(36,18)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-9.941 -8.059,-18 -18,-18 -9.941,0 -18,8.059 -18,18 0,9.941 8.059,18 18,18 C -8.059,18 0,9.941 0,0"/></g><g transform="translate(8.8955,2.4912)" id="g24"><path id="path26" style="fill:#808285;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.7,-0.412 1.421,-0.79 2.178,-1.106 l 6.576,14.615 -1.419,0 L 0,0 Z"/></g><g transform="translate(19.7695,16)" id="g28"><path id="path30" style="fill:#808285;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.42,0 6.577,-14.615 c 0.756,0.316 1.478,0.694 2.178,1.106 L 0,0 Z"/></g><path id="path32" style="fill:#58595b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 13.999,10 -2,0 0,-2 2,0 0,2 z"/><path id="path34" style="fill:#58595b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 24,10 -2,0 0,-2 2,0 0,2 z"/><g transform="translate(26,11)" id="g36"><path id="path38" style="fill:#a7a9ac;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -12,0 c -1.104,0 -2,0.896 -2,2 l 0,2 c 0,1.105 0.896,2 2,2 L -2,4 C -0.895,4 0,3.105 0,2 L 0,0 Z"/></g><g transform="translate(24.3633,30)" id="g40"><path id="path42" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -12.727,0 c -2.008,0 -3.636,-1.628 -3.636,-3.636 l 0,-9.364 0,-3 0,-1 c 0,-1.104 0.895,-2 2,-2 l 16,0 c 1.104,0 2,0.896 2,2 l 0,1 0,3 0,9.364 C 3.637,-1.628 2.009,0 0,0"/></g><g transform="translate(8,17)" id="g44"><path id="path46" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-3 0,-1 c 0,-1.104 0.896,-2 2,-2 l 16,0 c 1.105,0 2,0.896 2,2 l 0,1 0,3 0,4 L 0,4 0,0 Z"/></g><g transform="translate(26,19)" id="g48"><path id="path50" style="fill:#58595b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -12,0 c -1.104,0 -2,0.896 -2,2 l 0,7 c 0,1.104 0.896,2 2,2 L -2,9 C -0.895,9 0,8.104 0,7 L 0,0 Z"/></g><g transform="translate(24,20)" id="g52"><path id="path54" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 l -10,0 c -0.552,0 -1,0.448 -1,1 l 0,5 c 0,0.552 0.448,1 1,1 L -1,6 C -0.447,6 0,5.552 0,5 L 0,0 Z"/></g><path id="path56" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 14,13 -4,0 0,2 4,0 0,-2 z"/><path id="path58" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26,13 -4,0 0,2 4,0 0,-2 z"/><g transform="translate(20,27)" id="g60"><path id="path62" style="fill:#808285;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 l -2,0 c -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 l 2,0 C -0.447,1 0,0.552 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M36 18c0 9.941-8.059 18-18 18S0 27.941 0 18 8.059 0 18 0s18 8.059 18 18z"/><path d="M8.896 33.509c.7.412 1.421.79 2.178 1.106L17.65 20h-1.419L8.896 33.509zM19.77 20h-1.42l6.577 14.615c.756-.316 1.478-.694 2.178-1.106L19.77 20z" fill="#808285"/><path fill="#58595B" d="M12 26h2v2h-2zm10 0h2v2h-2z"/><path fill="#A7A9AC" d="M26 25c0 1.104-.896 2-2 2H12c-1.104 0-2-.896-2-2v-2c0-1.104.896-2 2-2h12c1.104 0 2 .896 2 2v2z"/><path fill="#D1D3D4" d="M24.363 6H11.636C9.628 6 8 7.628 8 9.636V23c0 1.104.896 2 2 2h16c1.104 0 2-.896 2-2V9.636C28 7.628 26.372 6 24.363 6z"/><path fill="#DD2E44" d="M8 19v4c0 1.104.896 2 2 2h16c1.104 0 2-.896 2-2v-8H8v4z"/><path fill="#58595B" d="M26 17c0 1.104-.896 2-2 2H12c-1.104 0-2-.896-2-2v-7c0-1.104.896-2 2-2h12c1.104 0 2 .896 2 2v7z"/><path fill="#55ACEE" d="M24 16c0 .552-.447 1-1 1H13c-.552 0-1-.448-1-1v-5c0-.552.448-1 1-1h10c.553 0 1 .448 1 1v5z"/><path fill="#FFD983" d="M10 21h4v2h-4zm12 0h4v2h-4z"/><path fill="#808285" d="M20 9c0 .552-.447 1-1 1h-2c-.552 0-1-.448-1-1s.448-1 1-1h2c.553 0 1 .448 1 1z"/></svg>
\ No newline at end of file