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/1f692.svg b/public/emoji/1f692.svg
index a7672c43d..711c9960b 100644
--- a/public/emoji/1f692.svg
+++ b/public/emoji/1f692.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(35,28)" id="g20"><path id="path22" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 -2,0 -2,0 -2,0 -2,0 -2,0 -2,0 -2,0 -2,0 -2,0 -2,0 c -0.552,0 -1,-0.448 -1,-1 0,-0.552 0.448,-1 1,-1 l 2,0 0,-2 2,0 0,2 2,0 0,-2 2,0 0,2 2,0 0,-2 2,0 0,2 2,0 0,-2 2,0 0,2 2,0 0,-2 2,0 0,2 2,0 c 0.553,0 1,0.448 1,1 0,0.552 -0.447,1 -1,1"/></g><g transform="translate(36,23)" id="g24"><path id="path26" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 l -22,0 c -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 L -1,1 C -0.447,1 0,0.552 0,0"/></g><g transform="translate(32,22)" id="g28"><path id="path30" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -10,0 -8,0 c 0,0 0.041,2 -2.979,2 l -5.875,0 C -32,2 -32,-5.959 -32,-5.959 L -32,-13 c 0,-2.209 1.791,-4 4,-4 l 28,0 c 2.209,0 4,1.791 4,4 l 0,9 C 4,-1.791 2.209,0 0,0"/></g><path id="path32" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 34,14 -32,0 0,-3 32,0 0,3 z"/><g transform="translate(11,5)" id="g34"><path id="path36" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 2.209,0 4,-1.791 4,-4"/></g><g transform="translate(9,5)" id="g38"><path id="path40" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.896,-2 -2,-2 -1.104,0 -2,0.895 -2,2 0,1.105 0.896,2 2,2 1.104,0 2,-0.895 2,-2"/></g><g transform="translate(32,5)" id="g42"><path id="path44" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 2.209,0 4,-1.791 4,-4"/></g><g transform="translate(30,5)" id="g46"><path id="path48" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.895,-2 -2,-2 -1.104,0 -2,0.895 -2,2 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2"/></g><g transform="translate(7,16)" id="g50"><path id="path52" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5,0 c 0,0 0,6 3,6 L 0,6 0,0 Z"/></g><g transform="translate(12,16)" id="g54"><path id="path56" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 0,6 1,0 C -1,6 0,5 0,4 L 0,0 Z"/></g><g transform="translate(8,25)" id="g58"><path id="path60" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.448,-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.448,1 0,0.552 0,0"/></g><g transform="translate(10,25)" id="g62"><path id="path64" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.448,-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.448,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="#CCD6DD" d="M35 8H13c-.552 0-1 .448-1 1s.448 1 1 1h2v2h2v-2h2v2h2v-2h2v2h2v-2h2v2h2v-2h2v2h2v-2h2c.553 0 1-.448 1-1s-.447-1-1-1zm1 5c0 .552-.447 1-1 1H13c-.552 0-1-.448-1-1s.448-1 1-1h22c.553 0 1 .448 1 1z"/><path fill="#DD2E44" d="M32 14H14s.041-2-2.979-2H5.146C0 12 0 19.959 0 19.959V27c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4v-9c0-2.209-1.791-4-4-4z"/><path fill="#F5F8FA" d="M2 22h32v3H2z"/><circle fill="#292F33" cx="7" cy="31" r="4"/><circle fill="#8899A6" cx="7" cy="31" r="2"/><circle fill="#292F33" cx="28" cy="31" r="4"/><circle fill="#8899A6" cx="28" cy="31" r="2"/><path fill="#55ACEE" d="M7 20H2s0-6 3-6h2v6zm5 0H9v-6h1c1 0 2 1 2 2v4z"/><path fill="#FFAC33" d="M8 11c0 .552-.448 1-1 1H5c-.552 0-1-.448-1-1s.448-1 1-1h2c.552 0 1 .448 1 1z"/><path fill="#3B88C3" d="M10 11c0 .552-.448 1-1 1H7c-.552 0-1-.448-1-1s.448-1 1-1h2c.552 0 1 .448 1 1z"/></svg>
\ No newline at end of file