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/1f1f2-1f1e9.svg b/public/emoji/1f1f2-1f1e9.svg
index b4f1fe18f..eb2d4a206 100644
--- a/public/emoji/1f1f2-1f1e9.svg
+++ b/public/emoji/1f1f2-1f1e9.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(32,31)" id="g20"><path id="path22" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -8,0 0,-26 8,0 c 2.209,0 4,1.791 4,4 L 4,-4 C 4,-1.791 2.209,0 0,0"/></g><g transform="translate(4,31)" id="g24"><path id="path26" style="fill:#265fb5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-18 c 0,-2.209 1.791,-4 4,-4 l 8,0 0,26 -8,0 z"/></g><path id="path28" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 12,5 24,5 24,31 12,31 12,5 Z"/><path id="path30" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 20,18 -4,0 0,3 4,0 0,-3 z"/><g transform="translate(16,18)" id="g32"><path id="path34" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,-2 2,-3 4,-2 4,0 0,0 Z"/></g><g transform="translate(16,25)" id="g36"><path id="path38" style="fill:#a0724a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-1 1,0 0,-2 2,0 0,2 0,1 -3,0 z"/></g><g transform="translate(19,15)" id="g40"><path id="path42" style="fill:#a0724a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1,-0.625 -2,0 -3,-3 -1,-4 1,-3 0,0 Z"/></g><g transform="translate(15,23)" id="g44"><path id="path46" style="fill:#a0724a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,1 -1,-1 0,-8 0,-2 2,2 0,7 1,0 -1,1 z"/></g><g transform="translate(22,24)" id="g48"><path id="path50" style="fill:#a0724a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,-1 -1,-1 1,0 0,-7 2,-2 0,2 0,8 -1,1 z"/></g><path id="path52" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16.766,18 -0.531,0 0,0.406 0.531,0 0,-0.406 z"/><path id="path54" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 19.766,18 -0.531,0 0,0.406 0.531,0 0,-0.406 z"/><g transform="translate(15.6372,13.2568)" id="g56"><path id="path58" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.106,-0.062 -0.263,0.01 -0.35,0.159 l -2.232,3.866 c -0.086,0.151 -0.07,0.322 0.037,0.383 l 0.135,0.078 c 0.107,0.062 0.264,-0.009 0.349,-0.159 L 0.172,0.46 C 0.259,0.311 0.242,0.14 0.136,0.078 L 0,0 Z"/></g><g transform="translate(22.8174,17.6074)" id="g60"><path id="path62" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.107,-0.061 0.125,-0.23 0.039,-0.377 L -2.152,-4.175 C -2.238,-4.322 -2.393,-4.391 -2.5,-4.33 l -0.135,0.078 c -0.106,0.063 -0.124,0.231 -0.039,0.378 l 2.193,3.798 c 0.085,0.146 0.24,0.217 0.346,0.154 L 0,0 Z"/></g><g transform="translate(16,15)" id="g64"><path id="path66" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,-1 0,-1 1,1 0,1 z"/></g><g transform="translate(20,15)" id="g68"><path id="path70" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,-1 1,-2 1,-1 0,0 Z"/></g><g transform="translate(18,19)" id="g72"><path id="path74" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1,1 -1,0 -1,-1.958 0,-3 1,-1.958 1,0 1,1 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#DD2E44" d="M32 5h-8v26h8c2.209 0 4-1.791 4-4V9c0-2.209-1.791-4-4-4z"/><path fill="#265FB5" d="M4 5C1.791 5 0 6.791 0 9v18c0 2.209 1.791 4 4 4h8V5H4z"/><path fill="#FFCC4D" d="M12 5h12v26H12z"/><path fill="#DD2E44" d="M16 15h4v3h-4z"/><path fill="#269" d="M16 18v2l2 1 2-1v-2z"/><path fill="#A0724A" d="M16 11v1h1v2h2v-3zm3 10l-1 .625L17 21l-1 3 2 1 2-1zm-4-8l-1-1-1 1v10l2-2v-7h1zm7-1l-1 1-1 1h1v7l2 2V13z"/><path fill="#FFCC4D" d="M16.234 17.594h.531V18h-.531zm3 0h.531V18h-.531z"/><path fill="#77B255" d="M15.637 22.743c-.106.062-.263-.01-.35-.159l-2.232-3.866c-.086-.15-.07-.321.037-.383l.136-.078c.106-.062.263.01.349.159l2.232 3.867c.087.149.07.32-.036.382l-.136.078z"/><path fill="#FFCC4D" d="M22.817 18.393c.107.061.125.23.039.377l-2.191 3.798c-.086.147-.24.216-.348.155l-.135-.078c-.106-.062-.124-.23-.039-.378l2.192-3.798c.085-.146.24-.217.347-.154l.135.078z"/><path fill="#DD2E44" d="M16 21l-1 1v1l1-1zm4 0v1l1 1v-1z"/><path fill="#FFCC4D" d="M18 17l-1-1v2.958L18 20l1-1.042V16z"/></svg>
\ No newline at end of file