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/1f3ec.svg b/public/emoji/1f3ec.svg
index da4dac448..c30d022ed 100644
--- a/public/emoji/1f3ec.svg
+++ b/public/emoji/1f3ec.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(14,2)" id="g20"><path id="path22" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 0.896,-2 2,-2 l 18,0 c 1.105,0 2,0.895 2,2 l 0,20 c 0,1.105 -0.895,2 -2,2 L 2,22 C 0.896,22 0,21.105 0,20 L 0,0 Z"/></g><g transform="translate(34,24)" id="g24"><path id="path26" style="fill:#bcbec0;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -14,0 0,-2 16,0 C 2,-0.895 1.105,0 0,0"/></g><path id="path28" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 20,0 34,0 34,20 20,20 20,0 Z"/><g transform="translate(18,36)" id="g30"><path id="path32" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -16,0 c -1.104,0 -2,-0.896 -2,-2 l 0,-32 c 0,-1.105 0.896,-2 2,-2 l 18,0 0,34 C 2,-0.896 1.105,0 0,0"/></g><g transform="translate(18,36)" id="g34"><path id="path36" style="fill:#bcbec0;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -16,0 c -1.104,0 -2,-0.896 -2,-2 L 2,-2 C 2,-0.896 1.105,0 0,0"/></g><path id="path38" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 2,10 16,0 0,4 -16,0 0,-4 z"/><path id="path40" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 2,16 16,0 0,4 -16,0 0,-4 z"/><path id="path42" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 2,22 16,0 0,4 -16,0 0,-4 z"/><path id="path44" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 2,28 16,0 0,4 -16,0 0,-4 z"/><path id="path46" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 2,0 18,0 18,8 2,8 2,0 Z"/><path id="path48" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 6,0 14,0 14,4 6,4 6,0 Z"/><path id="path50" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 23,0 8,0 0,4 -8,0 0,-4 z"/><path id="path52" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 35,8 -15,0 0,2 15,0 0,-2 z"/><path id="path54" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 35,14 -15,0 0,2 15,0 0,-2 z"/><g transform="translate(36,29)" id="g56"><path id="path58" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -10,0 c -1.104,0 -2,0.896 -2,2 l 0,2 c 0,1.104 0.896,2 2,2 L -2,4 C -0.895,4 0,3.104 0,2 L 0,0 Z"/></g><path id="path60" style="fill:#58595b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 28,24 -2,0 0,3 2,0 0,-3 z"/><path id="path62" style="fill:#58595b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 32,24 -2,0 0,3 2,0 0,-3 z"/><path id="path64" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 26,29 -2,0 0,2 2,0 0,-2 z"/><path id="path66" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 28,29 -2,0 0,2 2,0 0,-2 z"/><path id="path68" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 30,29 -2,0 0,2 2,0 0,-2 z"/><path id="path70" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 32,29 -2,0 0,2 2,0 0,-2 z"/><path id="path72" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 34,29 -2,0 0,2 2,0 0,-2 z"/></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCC4D" d="M14 34c0 1.104.896 2 2 2h18c1.104 0 2-.896 2-2V14c0-1.104-.896-2-2-2H16c-1.104 0-2 .896-2 2v20z"/><path fill="#BCBEC0" d="M34 12H20v2h16c0-1.104-.896-2-2-2z"/><path fill="#55ACEE" d="M20 16h14v20H20z"/><path fill="#FFE8B6" d="M18 0H2C.896 0 0 .896 0 2v32c0 1.104.896 2 2 2h18V2c0-1.104-.896-2-2-2z"/><path fill="#BCBEC0" d="M18 0H2C.896 0 0 .896 0 2h20c0-1.104-.896-2-2-2z"/><path fill="#55ACEE" d="M2 22h16v4H2zm0-6h16v4H2zm0-6h16v4H2zm0-6h16v4H2zm0 24h16v8H2z"/><path fill="#3B88C3" d="M6 32h8v4H6zm17 0h8v4h-8z"/><path fill="#FFCC4D" d="M20 26h15v2H20zm0-6h15v2H20z"/><path fill="#DD2E44" d="M36 7c0 1.104-.896 2-2 2H24c-1.104 0-2-.896-2-2V5c0-1.104.896-2 2-2h10c1.104 0 2 .896 2 2v2z"/><path fill="#58595B" d="M26 9h2v3h-2zm4 0h2v3h-2z"/><path fill="#F4ABBA" d="M24 5h2v2h-2z"/><path fill="#FFF" d="M26 5h2v2h-2z"/><path fill="#F4ABBA" d="M28 5h2v2h-2z"/><path fill="#FFF" d="M30 5h2v2h-2z"/><path fill="#F4ABBA" d="M32 5h2v2h-2z"/></svg>
\ No newline at end of file